Show More
@@ -2546,9 +2546,6 b' def fold(ui, repo, *files, **opts):' | |||||
2546 | q.checklocalchanges(repo) |
|
2546 | q.checklocalchanges(repo) | |
2547 |
|
2547 | |||
2548 | message = cmdutil.logmessage(ui, opts) |
|
2548 | message = cmdutil.logmessage(ui, opts) | |
2549 | if opts.get('edit'): |
|
|||
2550 | if message: |
|
|||
2551 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
|||
2552 |
|
2549 | |||
2553 | parent = q.lookup('qtip') |
|
2550 | parent = q.lookup('qtip') | |
2554 | patches = [] |
|
2551 | patches = [] |
@@ -174,10 +174,11 b' Test saving last-message.txt:' | |||||
174 | $ hg tip --template "{files}\n" |
|
174 | $ hg tip --template "{files}\n" | |
175 | aa |
|
175 | aa | |
176 |
|
176 | |||
177 |
(test that editor is not invoked before transaction starting |
|
177 | (test that editor is not invoked before transaction starting, | |
|
178 | and that combination of '--edit' and '--message' doesn't abort execution) | |||
178 |
|
179 | |||
179 | $ rm -f .hg/last-message.txt |
|
180 | $ rm -f .hg/last-message.txt | |
180 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e p3 |
|
181 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3 | |
181 | refresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
182 | refresh interrupted while patch was popped! (revert --all, qpush to recover) | |
182 | abort: emulating unexpected abort |
|
183 | abort: emulating unexpected abort | |
183 | [255] |
|
184 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now