Mercurial > hg-stable
diff tests/test-histedit-non-commute-abort.t @ 27134:cb5bdf65420f
debugmergestate: print out null nodes as 'null'
This is so much easier to read than a long string of zeroes, and we're going to
have a lot more of these nodes once change/delete conflicts are part of the
merge state.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 30 Nov 2015 10:26:37 -0800 |
parents | a01ecbcfaf84 |
children | 5837ca674da9 |
line wrap: on
line diff
--- a/tests/test-histedit-non-commute-abort.t Tue Nov 24 15:03:00 2015 -0800 +++ b/tests/test-histedit-non-commute-abort.t Mon Nov 30 10:26:37 2015 -0800 @@ -84,7 +84,7 @@ unrecognized entry: x advisory record file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) local path: e (flags "") - ancestor path: e (node 0000000000000000000000000000000000000000) + ancestor path: e (node null) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) $ hg resolve -l U e @@ -97,7 +97,7 @@ other: e860deea161a2f77de56603b340ebbb4536308ae file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) local path: e (flags "") - ancestor path: e (node 0000000000000000000000000000000000000000) + ancestor path: e (node null) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) unrecognized entry: X mandatory record $ hg resolve -l