Mercurial > hg-stable
diff tests/test-rebase-conflicts.t @ 29940:3e7ded768556
rebase: make debug logging more consistent
We emit some lines that mix revision numbers with nodeids, which makes
little sense to me.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 13 Sep 2016 13:49:42 -0700 |
| parents | 976cd337cac9 |
| children | c15f06109b7a |
line wrap: on
line diff
--- 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