Submitter | phabricator |
---|---|
Date | Jan. 25, 2020, 12:17 a.m. |
Message ID | <differential-rev-PHID-DREV-tknfn3hfqev4ikooy6h3-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/44644/ |
State | Superseded |
Headers | show |
Comments
pulkit added a comment. Looks like we don't have tests for `hg merge 'wdir()'`. Also I am not sure what should be the correct behavior in that case. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7996/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7996 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel
martinvonz added a comment.
In D7996#117931 <https://phab.mercurial-scm.org/D7996#117931>, @pulkit wrote:
> Looks like we don't have tests for `hg merge 'wdir()'`. Also I am not sure what should be the correct behavior in that case.
Yes, I just didn't care enough to add tests. I don't care much because it's such a weird thing for the user to do. I changed this only in order to clarify the control flow and how `node` gets assigned. I can add a test if you want.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7996/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7996
To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
martinvonz added a comment. In D7996#117951 <https://phab.mercurial-scm.org/D7996#117951>, @martinvonz wrote: > In D7996#117931 <https://phab.mercurial-scm.org/D7996#117931>, @pulkit wrote: > >> Looks like we don't have tests for `hg merge 'wdir()'`. Also I am not sure what should be the correct behavior in that case. > > Yes, I just didn't care enough to add tests. I don't care much because it's such a weird thing for the user to do. I changed this only in order to clarify the control flow and how `node` gets assigned. I can add a test if you want. Turns out we actually crash :P Let me add a test. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7996/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7996 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4866,8 +4866,7 @@ if node: node = scmutil.revsingle(repo, node).node() - - if not node: + else: if ui.configbool(b'commands', b'merge.require-rev'): raise error.Abort( _(