rebase: source is descendant of destination

schrei5 dominikruf at googlemail.com
Fri Apr 23 05:46:52 CDT 2010


I found another solution that doesn't need transplant.

You can update to rev 1, make a dummy changeset and then rebase rev 4 on top
off the new dummy changeset with --detach.

update -r 1
4 o 
   | 
3 o 
   | 
2 o 
   | 
1 o <-

edit a file x (e.g. add a blank line) and commit it

     o 5
     |
4 o |
   | |
3 o |
   | |
2 o |
   |/ 
1 o 

hg rebase -s 4 -d 5 --detach

     o 5 old 4
     |
     o 4 old 5
     |
3 o |
   | |
2 o |
   |/ 
1 o 

-- 
View this message in context: http://old.nabble.com/rebase%3A-source-is-descendant-of-destination-tp28329868p28339810.html
Sent from the Mercurial mailing list archive at Nabble.com.



More information about the Mercurial mailing list