##// END OF EJS Templates
unshelve: abort on using --keep and --interactive together...
Navaneeth Suresh -
r42988:4b0c9d47 default draft
parent child Browse files
Show More
@@ -942,6 +942,8 b' def dounshelve(ui, repo, *shelved, **opt'
942 if opts.get("name"):
942 if opts.get("name"):
943 shelved.append(opts["name"])
943 shelved.append(opts["name"])
944
944
945 if interactive and opts.get('keep'):
946 raise error.Abort(_('--keep on --interactive is not yet supported'))
945 if abortf or continuef:
947 if abortf or continuef:
946 if abortf and continuef:
948 if abortf and continuef:
947 raise error.Abort(_('cannot use both abort and continue'))
949 raise error.Abort(_('cannot use both abort and continue'))
@@ -1475,3 +1475,7 b' Abort unshelve while merging (issue5123)'
1475 record this change to 'bar2'?
1475 record this change to 'bar2'?
1476 (enter ? for help) [Ynesfdaq?] y
1476 (enter ? for help) [Ynesfdaq?] y
1477
1477
1478 -- test for --interactive --keep
1479 $ hg unshelve -i --keep
1480 abort: --keep on --interactive is not yet supported
1481 [255]
General Comments 0
You need to be logged in to leave comments. Login now