Mercurial > evolve
comparison tests/test-stabilize-result.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:32:54 +0100 |
| parents | 98941c28f3e2 |
| children |
comparison
equal
deleted
inserted
replaced
| 3591:98941c28f3e2 | 3592:7a5c3175015e |
|---|---|
| 52 o 0:07f494440405@default(draft) bk:[] adda | 52 o 0:07f494440405@default(draft) bk:[] adda |
| 53 | 53 |
| 54 $ hg debugobsolete | 54 $ hg debugobsolete |
| 55 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) | 55 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 56 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) | 56 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 57 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 57 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 58 | 58 |
| 59 Test evolve with conflict | 59 Test evolve with conflict |
| 60 | 60 |
| 61 $ ls | 61 $ ls |
| 62 a | 62 a |
| 63 b | 63 b |
| 64 $ hg pdiff a | 64 $ hg pdiff a |
| 65 diff -r 07f494440405 a | 65 diff -r 07f494440405 a |
| 66 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 66 --- a/a * (glob) |
| 67 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 67 +++ b/a * (glob) |
| 68 @@ -1,1 +1,2 @@ | 68 @@ -1,1 +1,2 @@ |
| 69 a | 69 a |
| 70 +a | 70 +a |
| 71 $ echo 'newer a' >> a | 71 $ echo 'newer a' >> a |
| 72 $ hg ci -m 'newer a' | 72 $ hg ci -m 'newer a' |
| 87 abort: unresolved merge conflicts (see hg help resolve) | 87 abort: unresolved merge conflicts (see hg help resolve) |
| 88 [255] | 88 [255] |
| 89 $ hg revert -r "orphan()" a | 89 $ hg revert -r "orphan()" a |
| 90 $ hg diff | 90 $ hg diff |
| 91 diff -r 66719795a494 a | 91 diff -r 66719795a494 a |
| 92 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 92 --- a/a * (glob) |
| 93 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 93 +++ b/a * (glob) |
| 94 @@ -1,1 +1,3 @@ | 94 @@ -1,1 +1,3 @@ |
| 95 a | 95 a |
| 96 +a | 96 +a |
| 97 +newer a | 97 +newer a |
| 98 $ hg evolve --continue | 98 $ hg evolve --continue |