[PATCH 1 of 6] rebase: improve error message for more than one external parent

Matt Mackall mpm at selenic.com
Wed Oct 23 17:53:52 CDT 2013


On Wed, 2013-10-23 at 21:04 +0200, Pierre-Yves David wrote:
> We start from:
> 
> @  7: 'H' 
> |
> | o    6: 'G' 
> | |\
> | | o  5: 'F' 
> | | | 
> | | o  4: 'E' 
> | | | 
> | o |  3: 'D' 
> | |\| 
> | o |  2: 'C' 
> |/ /
> | o  1: 'B' 
> |/
> o  0: 'A' 
> 
> And we try to rebase+collapse 2:: (2,3,6) on 7. And we can't because the result would have three parents (7, 1 and 5)
> 
> The new message: abort: unable to collapse, there is more than one external parent to 1
> - Wrongly present 1 as part of the rebased set,

That much seems clear, dropping this for now.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list