Mercurial > hg
comparison tests/test-resolve.t @ 23024:ec36969497de
resolve: run happily after conflict-free merge
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Wed, 08 Oct 2014 22:30:04 -0700 |
| parents | 63c9088bebad |
| children | b8dd8432395d |
comparison
equal
deleted
inserted
replaced
| 23023:63c9088bebad | 23024:ec36969497de |
|---|---|
| 86 $ hg up -qC 3 | 86 $ hg up -qC 3 |
| 87 $ hg merge 1 | 87 $ hg merge 1 |
| 88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 89 (branch merge, don't forget to commit) | 89 (branch merge, don't forget to commit) |
| 90 | 90 |
| 91 BROKEN: resolve --all should do nothing in merge without conflicts | 91 resolve --all should do nothing in merge without conflicts |
| 92 $ hg resolve --all | 92 $ hg resolve --all |
| 93 abort: resolve command not applicable when not merging | 93 (no more unresolved files) |
| 94 [255] | |
| 95 | 94 |
| 96 BROKEN: resolve -m should do nothing in merge without conflicts | 95 resolve -m should do nothing in merge without conflicts |
| 97 | 96 |
| 98 $ hg resolve -m | 97 $ hg resolve -m |
| 99 abort: resolve command not applicable when not merging | 98 (no more unresolved files) |
| 100 [255] | |
| 101 | 99 |
| 102 get back to conflicting state | 100 get back to conflicting state |
| 103 | 101 |
| 104 $ hg up -qC 2 | 102 $ hg up -qC 2 |
| 105 $ hg merge --tool=internal:fail 1 | 103 $ hg merge --tool=internal:fail 1 |