D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 24 20:49:53 EST 2020
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
More information about the Mercurial-devel
mailing list