Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 29936: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 |
comparison
equal
deleted
inserted
replaced
29935:e34cd85dc5b1 | 29936:3e7ded768556 |
---|---|
217 user: szhang | 217 user: szhang |
218 date: Tue Sep 03 13:55:08 2013 -0400 | 218 date: Tue Sep 03 13:55:08 2013 -0400 |
219 summary: added default.txt | 219 summary: added default.txt |
220 | 220 |
221 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used | 221 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
222 rebase onto 2 starting from e31216eec445 | 222 rebase onto 4bc80088dc6b starting from e31216eec445 |
223 ignoring null merge rebase of 3 | 223 ignoring null merge rebase of 3 |
224 ignoring null merge rebase of 4 | 224 ignoring null merge rebase of 4 |
225 ignoring null merge rebase of 6 | 225 ignoring null merge rebase of 6 |
226 ignoring null merge rebase of 8 | 226 ignoring null merge rebase of 8 |
227 rebasing 9:e31216eec445 "more changes to f1" | 227 rebasing 9:e31216eec445 "more changes to f1" |