Show More
@@ -194,7 +194,6 b' except ImportError:' | |||||
194 | import functools |
|
194 | import functools | |
195 | import os |
|
195 | import os | |
196 | import struct |
|
196 | import struct | |
197 | import time |
|
|||
198 |
|
197 | |||
199 | from mercurial.i18n import _ |
|
198 | from mercurial.i18n import _ | |
200 | from mercurial import ( |
|
199 | from mercurial import ( | |
@@ -1702,9 +1701,10 b' def _histedit(ui, repo, state, *freeargs' | |||||
1702 | if not hastags: |
|
1701 | if not hastags: | |
1703 | hastags = len(tags) |
|
1702 | hastags = len(tags) | |
1704 | if hastags: |
|
1703 | if hastags: | |
1705 |
ui. |
|
1704 | if ui.promptchoice(_('warning: tags associated with the given' | |
1706 |
'will be lost after histedit \n' |
|
1705 | ' changeset will be lost after histedit. \n' | |
1707 | time.sleep(1) |
|
1706 | 'do you want to continue (yN)? $$ &Yes $$ &No'), default=1): | |
|
1707 | raise error.Abort(_('histedit cancelled\n')) | |||
1708 | # rebuild state |
|
1708 | # rebuild state | |
1709 | if goal == goalcontinue: |
|
1709 | if goal == goalcontinue: | |
1710 | state.read() |
|
1710 | state.read() |
General Comments 0
You need to be logged in to leave comments.
Login now