##// END OF EJS Templates
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr...
Mads Kiilerich -
r20545:5936058f default
parent child Browse files
Show More
@@ -790,7 +790,7 b' def buildstate(repo, dest, rebaseset, co'
790 repo.ui.debug('source is a child of destination\n')
790 repo.ui.debug('source is a child of destination\n')
791 return None
791 return None
792
792
793 repo.ui.debug('rebase onto %d starting from %s\n' % (dest, roots))
793 repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
794 state.update(dict.fromkeys(rebaseset, nullrev))
794 state.update(dict.fromkeys(rebaseset, nullrev))
795 # Rebase tries to turn <dest> into a parent of <root> while
795 # Rebase tries to turn <dest> into a parent of <root> while
796 # preserving the number of parents of rebased changesets:
796 # preserving the number of parents of rebased changesets:
@@ -210,7 +210,7 b' Check that the right ancestors is used w'
210 summary: added default.txt
210 summary: added default.txt
211
211
212 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
212 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
213 rebase onto 2 starting from [<changectx e31216eec445>]
213 rebase onto 2 starting from e31216eec445
214 rebasing: 9:e31216eec445 5/6 changesets (83.33%)
214 rebasing: 9:e31216eec445 5/6 changesets (83.33%)
215 future parents are 2 and -1
215 future parents are 2 and -1
216 rebase status stored
216 rebase status stored
General Comments 0
You need to be logged in to leave comments. Login now