Mercurial > hg

comparison tests/test-graft-interrupted.t @ 45009:7d494425167c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue Differential Revision: https://phab.mercurial-scm.org/D8667
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 25 Jun 2020 13:27:37 -0700
parents 16c361152133
children c63a297fb964
comparison
equal deleted inserted replaced
45008:e1ea913da2ed 45009:7d494425167c
247 abort: unresolved conflicts, can't continue 247 abort: unresolved conflicts, can't continue
248 (use 'hg resolve' and 'hg graft --continue') 248 (use 'hg resolve' and 'hg graft --continue')
249 [1] 249 [1]
250 250
251 $ hg graft --stop --continue 251 $ hg graft --stop --continue
252 abort: cannot use '--continue' and '--stop' together 252 abort: cannot specify both --stop and --continue
253 [255] 253 [255]
254 254
255 $ hg graft --stop -U 255 $ hg graft --stop -U
256 abort: cannot specify any other flag with '--stop' 256 abort: cannot specify any other flag with '--stop'
257 [255] 257 [255]
353 abort: unresolved conflicts, can't continue 353 abort: unresolved conflicts, can't continue
354 (use 'hg resolve' and 'hg graft --continue') 354 (use 'hg resolve' and 'hg graft --continue')
355 [1] 355 [1]
356 356
357 $ hg graft --continue --abort 357 $ hg graft --continue --abort
358 abort: cannot use '--continue' and '--abort' together 358 abort: cannot specify both --abort and --continue
359 [255] 359 [255]
360 360
361 $ hg graft --abort --stop 361 $ hg graft --abort --stop
362 abort: cannot use '--abort' and '--stop' together 362 abort: cannot specify both --abort and --stop
363 [255] 363 [255]
364 364
365 $ hg graft --abort --currentuser 365 $ hg graft --abort --currentuser
366 abort: cannot specify any other flag with '--abort' 366 abort: cannot specify any other flag with '--abort'
367 [255] 367 [255]