Show More
@@ -1593,7 +1593,10 b' def histedit(ui, repo, *freeargs, **opts' | |||
|
1593 | 1593 | for intentional "edit" command, but also for resolving unexpected |
|
1594 | 1594 | conflicts). |
|
1595 | 1595 | """ |
|
1596 | if ui.interface('histedit') == 'curses': | |
|
1596 | # kludge: _chistedit only works for starting an edit, not aborting | |
|
1597 | # or continuing, so fall back to regular _texthistedit for those | |
|
1598 | # operations. | |
|
1599 | if ui.interface('histedit') == 'curses' and _getgoal(opts) == goalnew: | |
|
1597 | 1600 | return _chistedit(ui, repo, *freeargs, **opts) |
|
1598 | 1601 | return _texthistedit(ui, repo, *freeargs, **opts) |
|
1599 | 1602 |
@@ -161,7 +161,10 b' fix up' | |||
|
161 | 161 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
162 | 162 | Fix up the change (pick 7b4e2f4b7bcd) |
|
163 | 163 | (hg histedit --continue to resume) |
|
164 | $ hg histedit --continue 2>&1 | fixbundle | |
|
164 | We forcibly enable curses here so we can verify that continuing works | |
|
165 | with curses enabled. | |
|
166 | $ hg histedit --continue --config ui.interactive=true \ | |
|
167 | > --config ui.interface=curses 2>&1 | fixbundle | |
|
165 | 168 | abort: unresolved merge conflicts (see 'hg help resolve') |
|
166 | 169 | |
|
167 | 170 | This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
General Comments 0
You need to be logged in to leave comments.
Login now