Show More
@@ -452,8 +452,6 b' def createcmd(ui, repo, pats, opts):' | |||
|
452 | 452 | def _docreatecmd(ui, repo, pats, opts): |
|
453 | 453 | wctx = repo[None] |
|
454 | 454 | parents = wctx.parents() |
|
455 | if len(parents) > 1: | |
|
456 | raise error.Abort(_('cannot shelve while merging')) | |
|
457 | 455 | parent = parents[0] |
|
458 | 456 | origbranch = wctx.branch() |
|
459 | 457 | |
@@ -979,12 +977,6 b' def _dounshelve(ui, repo, *shelved, **op' | |||
|
979 | 977 | return unshelvecontinue(ui, repo, state, opts) |
|
980 | 978 | elif len(shelved) > 1: |
|
981 | 979 | raise error.Abort(_('can only unshelve one change at a time')) |
|
982 | ||
|
983 | # abort unshelve while merging (issue5123) | |
|
984 | parents = repo[None].parents() | |
|
985 | if len(parents) > 1: | |
|
986 | raise error.Abort(_('cannot unshelve while merging')) | |
|
987 | ||
|
988 | 980 | elif not shelved: |
|
989 | 981 | shelved = listshelves(repo) |
|
990 | 982 | if not shelved: |
General Comments 0
You need to be logged in to leave comments.
Login now