Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
27133:8dff49c34a67 | 27134:cb5bdf65420f |
---|---|
82 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 | 82 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
83 other: e860deea161a2f77de56603b340ebbb4536308ae | 83 other: e860deea161a2f77de56603b340ebbb4536308ae |
84 unrecognized entry: x advisory record | 84 unrecognized entry: x advisory record |
85 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) | 85 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
86 local path: e (flags "") | 86 local path: e (flags "") |
87 ancestor path: e (node 0000000000000000000000000000000000000000) | 87 ancestor path: e (node null) |
88 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) | 88 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |
89 $ hg resolve -l | 89 $ hg resolve -l |
90 U e | 90 U e |
91 | 91 |
92 insert unsupported mandatory merge record | 92 insert unsupported mandatory merge record |
95 * version 2 records | 95 * version 2 records |
96 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 | 96 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
97 other: e860deea161a2f77de56603b340ebbb4536308ae | 97 other: e860deea161a2f77de56603b340ebbb4536308ae |
98 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) | 98 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
99 local path: e (flags "") | 99 local path: e (flags "") |
100 ancestor path: e (node 0000000000000000000000000000000000000000) | 100 ancestor path: e (node null) |
101 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) | 101 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |
102 unrecognized entry: X mandatory record | 102 unrecognized entry: X mandatory record |
103 $ hg resolve -l | 103 $ hg resolve -l |
104 abort: unsupported merge state records: X | 104 abort: unsupported merge state records: X |
105 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) | 105 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) |