Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr
authorMads Kiilerich <madski@unity3d.com>
Sat, 15 Feb 2014 01:23:12 +0100
changeset 20545 5936058f6bad
parent 20544 8982a5397687
child 20546 bf1d91ab1efb
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr The debug statement is already in a 'for root in roots' so it was probably the intention to show root instead of roots. Do that.
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-conflicts.t file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Wed Feb 12 23:44:30 2014 +0100
+++ b/hgext/rebase.py	Sat Feb 15 01:23:12 2014 +0100
@@ -790,7 +790,7 @@
                 repo.ui.debug('source is a child of destination\n')
                 return None
 
-        repo.ui.debug('rebase onto %d starting from %s\n' % (dest, roots))
+        repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
         state.update(dict.fromkeys(rebaseset, nullrev))
         # Rebase tries to turn <dest> into a parent of <root> while
         # preserving the number of parents of rebased changesets:
--- a/tests/test-rebase-conflicts.t	Wed Feb 12 23:44:30 2014 +0100
+++ b/tests/test-rebase-conflicts.t	Sat Feb 15 01:23:12 2014 +0100
@@ -210,7 +210,7 @@
      summary:     added default.txt
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
-  rebase onto 2 starting from [<changectx e31216eec445>]
+  rebase onto 2 starting from e31216eec445
   rebasing: 9:e31216eec445 5/6 changesets (83.33%)
    future parents are 2 and -1
   rebase status stored
hg-stable