Page MenuHomePhabricator

commit: force create a new filenode if it was set in mergestate by merge
ClosedPublic

Authored by pulkit on Sep 5 2020, 3:11 AM.

Details

Summary

For reasons mentioned in previous commits, we will like to forcefully create a
new filenode sometimes.

Combination of this patch and previous one, we fixed a case in
test-merge-combination.t.

This does not yet results in conflict where it should, I need to investigate
more about what's happening as it should be a change-delete conflict now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 5 2020, 3:11 AM

Cf feedback on the previous changeset about the semantic of the message.

Also, did you says you wanted to gate this behind a conflig flag for now ?

You should also document the effect on test-merge-criss-cross.t, small bump of the idea of having a summary of the issues in the test itself so we can track they status.

marmoute requested changes to this revision.Sep 11 2020, 5:17 AM
This revision now requires changes to proceed.Sep 11 2020, 5:17 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.