Mercurial > hg
comparison tests/test-graft.t @ 27172:4d61c847e06c
summary: mention graft
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 02 Dec 2015 06:31:12 +0000 |
| parents | 296d55def9c4 |
| children | 8a8f5d71a49a |
comparison
equal
deleted
inserted
replaced
| 27171:3028ea0aff46 | 27172:4d61c847e06c |
|---|---|
| 193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 194 abort: unresolved conflicts, can't continue | 194 abort: unresolved conflicts, can't continue |
| 195 (use hg resolve and hg graft --continue) | 195 (use hg resolve and hg graft --continue) |
| 196 [255] | 196 [255] |
| 197 | 197 |
| 198 Summary should mention graft: | |
| 199 | |
| 200 $ hg summary |grep graft | |
| 201 commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) | |
| 202 | |
| 198 Commit while interrupted should fail: | 203 Commit while interrupted should fail: |
| 199 | 204 |
| 200 $ hg ci -m 'commit interrupted graft' | 205 $ hg ci -m 'commit interrupted graft' |
| 201 abort: graft in progress | 206 abort: graft in progress |
| 202 (use 'hg graft --continue' or 'hg update' to abort) | 207 (use 'hg graft --continue' or 'hg update' to abort) |