[PATCH stable] tests: test `clone --rebase` when local has mq patches applied

Matt Mackall mpm at selenic.com
Wed Nov 3 11:46:12 CDT 2010


On Wed, 2010-11-03 at 11:43 -0500, Matt Mackall wrote:
> On Sun, 2010-10-31 at 11:58 +0900, Nicolas Dumazet wrote:
> > I agree that the message we currently output in 2) is awfuly
> > confusing: "abort: cannot rebase onto an applied mq patch", and that
> > should be improved post 1.7, but as far as I can tell it seems logical
> > not to rebase the queue onto a different branch. Am I wrong?
> 
> Probably? Why wouldn't we allow that?

Oh, I see. No, we perhaps shouldn't do it if we just say "hg rebase" (or
equivalently "hg pull --rebase"). But if I explicitly say:

hg rebase -s . -d otherbranch

..then it ought to work.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list