equal
deleted
inserted
replaced
219 Summary should mention graft: |
219 Summary should mention graft: |
220 |
220 |
221 $ hg summary |grep graft |
221 $ hg summary |grep graft |
222 commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) |
222 commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) |
223 |
223 |
|
224 Using status to get more context |
|
225 |
|
226 $ hg status --verbose |
|
227 M d |
|
228 M e |
|
229 ? a.orig |
|
230 ? e.orig |
|
231 # The repository is in an unfinished *graft* state. |
|
232 |
|
233 # Unresolved merge conflicts: |
|
234 # |
|
235 # e |
|
236 # |
|
237 # To mark files as resolved: hg resolve --mark FILE |
|
238 |
|
239 # To continue: hg graft --continue |
|
240 # To abort: hg update --clean . (warning: this will discard uncommitted changes) |
|
241 |
|
242 |
224 Commit while interrupted should fail: |
243 Commit while interrupted should fail: |
225 |
244 |
226 $ hg ci -m 'commit interrupted graft' |
245 $ hg ci -m 'commit interrupted graft' |
227 abort: graft in progress |
246 abort: graft in progress |
228 (use 'hg graft --continue' or 'hg update' to abort) |
247 (use 'hg graft --continue' or 'hg update' to abort) |