Mercurial Mercurial > mercurial / 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: make debug logging more consistent
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 13 Sep 2016 13:49:42 -0700
changeset 29936 3e7ded768556
parent 29935 e34cd85dc5b1
child 29937 2c302c654451
rebase: make debug logging more consistent We emit some lines that mix revision numbers with nodeids, which makes little sense to me.
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-conflicts.t file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Sun Jun 26 18:41:28 2016 +0900
+++ b/hgext/rebase.py	Tue Sep 13 13:49:42 2016 -0700
@@ -1198,7 +1198,7 @@
                 repo.ui.debug('source is a child of destination\n')
                 return None
 
-        repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
+        repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root))
         state.update(dict.fromkeys(rebaseset, revtodo))
         # 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	Sun Jun 26 18:41:28 2016 +0900
+++ b/tests/test-rebase-conflicts.t	Tue Sep 13 13:49:42 2016 -0700
@@ -219,7 +219,7 @@
      summary:     added default.txt
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
-  rebase onto 2 starting from e31216eec445
+  rebase onto 4bc80088dc6b starting from e31216eec445
   ignoring null merge rebase of 3
   ignoring null merge rebase of 4
   ignoring null merge rebase of 6
mercurial