Mercurial > hg
comparison tests/test-graft.t @ 19253:e078ea9b4ce4 stable
graft: refuse to commit an interrupted graft (issue3667)
| author | Simon King <simon@simonking.org.uk> |
|---|---|
| date | Thu, 30 May 2013 22:32:10 +0100 |
| parents | 76b69cccb07a |
| children | 0af993732f66 |
comparison
equal
deleted
inserted
replaced
| 19236:39ea540dc154 | 19253:e078ea9b4ce4 |
|---|---|
| 172 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') | 172 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 173 abort: unresolved conflicts, can't continue | 173 abort: unresolved conflicts, can't continue |
| 174 (use hg resolve and hg graft --continue) | 174 (use hg resolve and hg graft --continue) |
| 175 [255] | 175 [255] |
| 176 | 176 |
| 177 Commit while interrupted should fail: | |
| 178 | |
| 179 $ hg ci -m 'commit interrupted graft' | |
| 180 abort: cannot commit an interrupted graft operation | |
| 181 (use "hg graft -c" to continue graft) | |
| 182 [255] | |
| 183 | |
| 177 Continue without resolve should fail: | 184 Continue without resolve should fail: |
| 178 | 185 |
| 179 $ hg graft -c | 186 $ hg graft -c |
| 180 grafting revision 4 | 187 grafting revision 4 |
| 181 abort: unresolved merge conflicts (see hg help resolve) | 188 abort: unresolved merge conflicts (see hg help resolve) |