Mercurial > evolve
comparison tests/test-evolve.t @ 1746:343298df3f26 mercurial-3.9
integrate code update and test change from future 5.5 code
This prove that the code is compatible with 3.9
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 28 Oct 2016 16:03:00 +0200 |
| parents | 5383671ef612 |
| children | 83cf722eafc3 5526e97928d7 |
comparison
equal
deleted
inserted
replaced
| 1744:db0a54205221 | 1746:343298df3f26 |
|---|---|
| 110 0 - 1f0dee641bb7 add a (public) | 110 0 - 1f0dee641bb7 add a (public) |
| 111 | 111 |
| 112 test kill and immutable changeset | 112 test kill and immutable changeset |
| 113 | 113 |
| 114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' | 114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
| 115 1 public stable | 115 1 public |
| 116 $ hg prune 1 | 116 $ hg prune 1 |
| 117 abort: cannot prune immutable changeset: 7c3bad9141dc | 117 abort: cannot prune immutable changeset: 7c3bad9141dc |
| 118 (see "hg help phases" for details) | 118 (see "hg help phases" for details) |
| 119 [255] | 119 [255] |
| 120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' | 120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
| 121 1 public stable | 121 1 public |
| 122 | 122 |
| 123 test simple kill | 123 test simple kill |
| 124 | 124 |
| 125 $ hg id -n | 125 $ hg id -n |
| 126 5 | 126 5 |
| 596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') | 596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
| 597 abort: unresolved conflicts, can't continue | 597 abort: unresolved conflicts, can't continue |
| 598 (use 'hg resolve' and 'hg graft --continue') | 598 (use 'hg resolve' and 'hg graft --continue') |
| 599 [255] | 599 [255] |
| 600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' | 600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
| 601 7:a5bfd90a2f29 stable | 601 7:a5bfd90a2f29 |
| 602 $ echo 3 > 1 | 602 $ echo 3 > 1 |
| 603 $ hg resolve -m 1 | 603 $ hg resolve -m 1 |
| 604 (no more unresolved files) | 604 (no more unresolved files) |
| 605 continue: hg graft --continue | 605 continue: hg graft --continue |
| 606 $ hg graft --continue -O | 606 $ hg graft --continue -O |