On Thu, 17 Mar 2011 16:00:50 +0100, Antoine Pitrou <solip...@pitrou.net> wrote: > On Thu, 17 Mar 2011 10:50:24 -0400 > "R. David Murray" <rdmur...@bitdance.com> wrote: > > On Thu, 17 Mar 2011 14:33:00 +0100, Antoine Pitrou <solip...@pitrou.net> > > wrote: > > > On Thu, 17 Mar 2011 09:24:26 -0400 > > > "R. David Murray" <rdmur...@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. > > > > So maybe the problem was that I tried hg pull --rebase, and that mucked > > with the checkout. > > Can't you just fix the checkout then, using "hg up" or even "hg up -C"? > (note: I'm not a rebase expert)
Perhaps, at the time I knew even less than I do now about mercurial. hg up didn't work, but maybe hg up -C would have. I'll try it again at some point. -- R. David Murray www.bitdance.com _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
