RetroSearch Browse

Sun Mar 20 12:17:25 CET 2011 · https://mail.python.org/pipermail/python-dev/2011-March/109568.html

Le dimanche 20 mars 2011 à 00:06 -0400, R. David Murray a écrit :
> On Thu, 17 Mar 2011 14:33:00 +0100,  wrote:
> > On Thu, 17 Mar 2011 09:24:26 -0400
> > "R. David Murray" <rdmurray at bitdance.com> wrote:
> > > 
> > > It would be great if rebase did work with share, that would make a
> > > push race basically a non-issue for me.
> > 
> > rebase as well as strip destroy some history, meaning some of your
> > shared clones may end up having their working copy based on a
> > non-existent changeset. I'm not sure why rebase would be worse that
> > strip in that regard, though.
> 
> Well, it turns out that this completely doesn't work, though at first
> it appeared to (and so I pushed).
> 
> I had a push race, so I did hg pull; hg rebase.

Have you tried hg pull --rebase instead?
If you "hg rebase" by hand, I think you have to tell it the right set of
revisions to rebase.

Regards

Antoine.

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://mail.python.org/pipermail/python-dev/2011-March/109568.html below:

[Python-Dev] Hg: inter-branch workflow