equal
deleted
inserted
replaced
48 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
48 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
49 |/ |
49 |/ |
50 o 0:07f494440405@default(draft) bk:[] adda |
50 o 0:07f494440405@default(draft) bk:[] adda |
51 |
51 |
52 $ hg debugobsolete |
52 $ hg debugobsolete |
53 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
53 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
54 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
54 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} |
55 |
55 |
56 Test evolve with conflict |
56 Test evolve with conflict |
57 |
57 |
58 $ ls |
58 $ ls |
59 a |
59 a |
60 b |
60 b |
61 $ hg pdiff a |
61 $ hg pdiff a |
62 diff -r 07f494440405 a |
62 diff -r 07f494440405 a |
63 --- a/a * (glob) |
63 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
64 +++ b/a * (glob) |
64 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
65 @@ -1,1 +1,2 @@ |
65 @@ -1,1 +1,2 @@ |
66 a |
66 a |
67 +a |
67 +a |
68 $ echo 'newer a' >> a |
68 $ echo 'newer a' >> a |
69 $ hg ci -m 'newer a' |
69 $ hg ci -m 'newer a' |
84 abort: unresolved merge conflicts (see hg help resolve) |
84 abort: unresolved merge conflicts (see hg help resolve) |
85 [255] |
85 [255] |
86 $ hg revert -r "orphan()" a |
86 $ hg revert -r "orphan()" a |
87 $ hg diff |
87 $ hg diff |
88 diff -r 66719795a494 a |
88 diff -r 66719795a494 a |
89 --- a/a * (glob) |
89 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
90 +++ b/a * (glob) |
90 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
91 @@ -1,1 +1,3 @@ |
91 @@ -1,1 +1,3 @@ |
92 a |
92 a |
93 +a |
93 +a |
94 +newer a |
94 +newer a |
95 $ hg evolve --continue |
95 $ hg evolve --continue |