Mercurial > evolve
comparison tests/test-evolve-phase.t @ 3394:d1486760fb8d
tests: add a test demonstrating we still use graft in conflict markers
This patch adds a test which shows that we still use the word graft in the
conflict markers. Next patch will start using evolve instead of graft.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 11 Jan 2018 18:38:09 +0530 |
| parents | be41e4740a25 |
| children | 02192ac8ef98 |
comparison
equal
deleted
inserted
replaced
| 3393:a29d063d09e1 | 3394:d1486760fb8d |
|---|---|
| 89 evolve failed! | 89 evolve failed! |
| 90 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 90 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
| 91 abort: unresolved merge conflicts (see hg help resolve) | 91 abort: unresolved merge conflicts (see hg help resolve) |
| 92 [255] | 92 [255] |
| 93 | 93 |
| 94 $ hg diff | |
| 95 diff -r 87495ea7c9ec a | |
| 96 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
| 97 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
| 98 @@ -1,1 +1,5 @@ | |
| 99 +<<<<<<< local: 87495ea7c9ec - test: b | |
| 100 b2 | |
| 101 +======= | |
| 102 +c | |
| 103 +>>>>>>> graft: 13833940840c - test: c | |
| 104 | |
| 94 $ hg glog | 105 $ hg glog |
| 95 @ 3 - 87495ea7c9ec b (draft) | 106 @ 3 - 87495ea7c9ec b (draft) |
| 96 | | 107 | |
| 97 | * 2 - 13833940840c c (secret) | 108 | * 2 - 13833940840c c (secret) |
| 98 | | | 109 | | |