##// END OF EJS Templates
summary: mention graft
timeless -
r27172:4d61c847 default
parent child Browse files
Show More
@@ -6272,6 +6272,8 b' def summary(ui, repo, **opts):'
6272 t = ', '.join(t)
6272 t = ', '.join(t)
6273 cleanworkdir = False
6273 cleanworkdir = False
6274
6274
6275 if repo.vfs.exists('graftstate'):
6276 t += _(' (graft in progress)')
6275 if repo.vfs.exists('updatestate'):
6277 if repo.vfs.exists('updatestate'):
6276 t += _(' (interrupted update)')
6278 t += _(' (interrupted update)')
6277 elif len(parents) > 1:
6279 elif len(parents) > 1:
@@ -195,6 +195,11 b' Graft out of order, skipping a merge and'
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'
General Comments 0
You need to be logged in to leave comments. Login now