Page MenuHomePhabricator

copies-tests: add a case where with merge with an overwritten files
ClosedPublic

Authored by marmoute on Mar 5 2020, 1:14 PM.

Details

Summary

This is similar to the BF/FB case, but in this case, the other branch updated
the file. So an actual merge happens and the two "independant" file history has
to be merged.

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

marmoute created this revision.Mar 5 2020, 1:14 PM
marmoute updated this revision to Diff 20549.Mar 6 2020, 5:21 AM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
412

one of them should be "mFGm"

413

just out of curiosity, what does the trailing "]" you put in the template indicate?

marmoute added inline comments.Mar 6 2020, 4:50 PM
tests/test-copies-chain-merge.t
412

right, good spot. Thanks

413

This is probably a typo. We can clean it up afterward.

martinvonz added inline comments.Mar 6 2020, 4:51 PM
tests/test-copies-chain-merge.t
413

Sure. Could you include that fix in the series? I've seen too many "we can clean it up afterward" be forgotten.

marmoute updated this revision to Diff 20594.Mar 6 2020, 6:52 PM

series update after Martin feedback

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.