equal
deleted
inserted
replaced
78 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
78 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
79 $ hg debugmergestate |
79 $ hg debugmergestate |
80 * version 2 records |
80 * version 2 records |
81 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
81 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
82 other: e860deea161a2f77de56603b340ebbb4536308ae |
82 other: e860deea161a2f77de56603b340ebbb4536308ae |
|
83 labels: |
|
84 local: local |
|
85 other: histedit |
83 unrecognized entry: x advisory record |
86 unrecognized entry: x advisory record |
84 file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000) |
87 file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000) |
85 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
88 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
86 local path: e (flags "") |
89 local path: e (flags "") |
87 ancestor path: e (node null) |
90 ancestor path: e (node null) |
93 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X |
96 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X |
94 $ hg debugmergestate |
97 $ hg debugmergestate |
95 * version 2 records |
98 * version 2 records |
96 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
99 local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
97 other: e860deea161a2f77de56603b340ebbb4536308ae |
100 other: e860deea161a2f77de56603b340ebbb4536308ae |
|
101 labels: |
|
102 local: local |
|
103 other: histedit |
98 file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000) |
104 file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000) |
99 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
105 file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f) |
100 local path: e (flags "") |
106 local path: e (flags "") |
101 ancestor path: e (node null) |
107 ancestor path: e (node null) |
102 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |
108 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |