Changeset 2da275d97282…
Parent c20c10058116…
by
Changes to one file · Browse files at 2da275d97282 Showing diff from parent c20c10058116 Diff from another changeset...
@@ -145,7 +145,7 @@ args = self.repo.opener('undo.desc', 'r').read().splitlines()
if args[1] != 'commit':
return None
- return args[1], int(args[0])-1
+ return args[1], int(args[0])
except (IOError, IndexError, ValueError):
pass
return None
@@ -162,7 +162,7 @@ else:
if not QuestionMsgBox(_('Undo last transaction?'),
_('Rollback to revision %d (undo %s)?') %
- (data[1], data[0])):
+ (data[1]-1, data[0])):
return
try:
rev = self.repo['.'].rev()
@@ -171,7 +171,7 @@ _('Unable to determine working copy revision\n') +
hglib.tounicode(e))
return
- if rev > data[1] and not QuestionMsgBox(
+ if rev >= data[1] and not QuestionMsgBox(
_('Remove current working revision?'),
_('Your current working revision (%d) will be removed '
'by this rollback, leaving uncommitted changes.\n '
|
Loading...