##// END OF EJS Templates
morestatus: mention --stop even if not using --verbose...
Kyle Lippincott -
r45774:a253ded5 default
parent child Browse files
Show More
@@ -164,10 +164,19 b' class _statecheck(object):'
164 operation
164 operation
165 """
165 """
166 if not self._cmdhint:
166 if not self._cmdhint:
167 if not self._stopflag:
167 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
168 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
168 self._opname,
169 self._opname,
169 self._opname,
170 self._opname,
170 )
171 )
172 else:
173 return _(b"use 'hg %s --continue', 'hg %s --abort', "
174 b"or 'hg %s --stop'") % (
175 self._opname,
176 self._opname,
177 self._opname,
178 )
179
171 return self._cmdhint
180 return self._cmdhint
172
181
173 def msg(self):
182 def msg(self):
@@ -25,6 +25,6 b' Abort absorb if there is an unfinished o'
25
25
26 $ hg --config extensions.rebase= absorb
26 $ hg --config extensions.rebase= absorb
27 abort: rebase in progress
27 abort: rebase in progress
28 (use 'hg rebase --continue' or 'hg rebase --abort')
28 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
29 [255]
29 [255]
30
30
@@ -878,7 +878,7 b' fixing the working directory if there ar'
878
878
879 $ hg --config extensions.rebase= fix -r .
879 $ hg --config extensions.rebase= fix -r .
880 abort: rebase in progress
880 abort: rebase in progress
881 (use 'hg rebase --continue' or 'hg rebase --abort')
881 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
882 [255]
882 [255]
883
883
884 $ cd ..
884 $ cd ..
@@ -327,7 +327,7 b' user has somehow managed to update to a '
327 $ echo new > a
327 $ echo new > a
328 $ hg up 1 # user gets an error saying to run hg rebase --abort
328 $ hg up 1 # user gets an error saying to run hg rebase --abort
329 abort: rebase in progress
329 abort: rebase in progress
330 (use 'hg rebase --continue' or 'hg rebase --abort')
330 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
331 [255]
331 [255]
332
332
333 $ cat a
333 $ cat a
@@ -397,20 +397,20 b' New operations are blocked with the corr'
397
397
398 $ hg rebase -s 3 -d tip
398 $ hg rebase -s 3 -d tip
399 abort: rebase in progress
399 abort: rebase in progress
400 (use 'hg rebase --continue' or 'hg rebase --abort')
400 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
401 [255]
401 [255]
402 $ hg up .
402 $ hg up .
403 abort: rebase in progress
403 abort: rebase in progress
404 (use 'hg rebase --continue' or 'hg rebase --abort')
404 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
405 [255]
405 [255]
406 $ hg up -C .
406 $ hg up -C .
407 abort: rebase in progress
407 abort: rebase in progress
408 (use 'hg rebase --continue' or 'hg rebase --abort')
408 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
409 [255]
409 [255]
410
410
411 $ hg graft 3
411 $ hg graft 3
412 abort: rebase in progress
412 abort: rebase in progress
413 (use 'hg rebase --continue' or 'hg rebase --abort')
413 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
414 [255]
414 [255]
415
415
416 $ hg abort
416 $ hg abort
@@ -901,7 +901,7 b" Test rebasing when we're in the middle o"
901 [1]
901 [1]
902 $ hg rebase -r 3 -d 1 -t:merge3
902 $ hg rebase -r 3 -d 1 -t:merge3
903 abort: rebase in progress
903 abort: rebase in progress
904 (use 'hg rebase --continue' or 'hg rebase --abort')
904 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
905 [255]
905 [255]
906 $ hg resolve --list
906 $ hg resolve --list
907 U foo
907 U foo
@@ -2055,7 +2055,7 b' Test --stop raise errors with conflictin'
2055
2055
2056 $ hg rebase -s 3 -d 5
2056 $ hg rebase -s 3 -d 5
2057 abort: rebase in progress
2057 abort: rebase in progress
2058 (use 'hg rebase --continue' or 'hg rebase --abort')
2058 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
2059 [255]
2059 [255]
2060 $ hg rebase --stop --continue
2060 $ hg rebase --stop --continue
2061 abort: cannot specify both --stop and --continue
2061 abort: cannot specify both --stop and --continue
General Comments 0
You need to be logged in to leave comments. Login now