Show More
@@ -4866,8 +4866,7 b' def merge(ui, repo, node=None, **opts):' | |||||
4866 |
|
4866 | |||
4867 | if node: |
|
4867 | if node: | |
4868 | node = scmutil.revsingle(repo, node).node() |
|
4868 | node = scmutil.revsingle(repo, node).node() | |
4869 |
|
4869 | else: | ||
4870 | if not node: |
|
|||
4871 | if ui.configbool(b'commands', b'merge.require-rev'): |
|
4870 | if ui.configbool(b'commands', b'merge.require-rev'): | |
4872 | raise error.Abort( |
|
4871 | raise error.Abort( | |
4873 | _( |
|
4872 | _( | |
@@ -4877,6 +4876,9 b' def merge(ui, repo, node=None, **opts):' | |||||
4877 | ) |
|
4876 | ) | |
4878 | node = repo[destutil.destmerge(repo)].node() |
|
4877 | node = repo[destutil.destmerge(repo)].node() | |
4879 |
|
4878 | |||
|
4879 | if node is None: | |||
|
4880 | raise error.Abort(_(b'merging with the working copy has no effect')) | |||
|
4881 | ||||
4880 | if opts.get(b'preview'): |
|
4882 | if opts.get(b'preview'): | |
4881 | # find nodes that are ancestors of p2 but not of p1 |
|
4883 | # find nodes that are ancestors of p2 but not of p1 | |
4882 | p1 = repo.lookup(b'.') |
|
4884 | p1 = repo.lookup(b'.') |
General Comments 0
You need to be logged in to leave comments.
Login now