Mercurial > hg
comparison tests/test-histedit-non-commute-abort.t @ 27629:e7ff83b2bcfe
histedit: list action when intervention is required
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 23 Dec 2015 08:57:04 +0000 |
| parents | 5837ca674da9 |
| children | 34165875fa5d |
comparison
equal
deleted
inserted
replaced
| 27628:707d66afce21 | 27629:e7ff83b2bcfe |
|---|---|
| 70 > pick 652413bf663e f | 70 > pick 652413bf663e f |
| 71 > EOF | 71 > EOF |
| 72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 73 merging e | 73 merging e |
| 74 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 74 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 75 Fix up the change and run hg histedit --continue | 75 Fix up the change (pick e860deea161a) |
| 76 (hg histedit --continue to resume) | |
| 76 | 77 |
| 77 insert unsupported advisory merge record | 78 insert unsupported advisory merge record |
| 78 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x | 79 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
| 79 $ hg debugmergestate | 80 $ hg debugmergestate |
| 80 * version 2 records | 81 * version 2 records |