# HG changeset patch # User Mads Kiilerich # Date 1392423792 -3600 # Node ID 5936058f6bada78917d4bcd2d42523e0cfa37077 # Parent 8982a5397687c76665fc8f8c4a761527b4ae4779 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. diff -r 8982a5397687 -r 5936058f6bad hgext/rebase.py --- 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 into a parent of while # preserving the number of parents of rebased changesets: diff -r 8982a5397687 -r 5936058f6bad tests/test-rebase-conflicts.t --- 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 [] + rebase onto 2 starting from e31216eec445 rebasing: 9:e31216eec445 5/6 changesets (83.33%) future parents are 2 and -1 rebase status stored