Page MenuHomePhabricator

copies-tests: add a case where a file is deleted/added but with a merge
ClosedPublic

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

Details

Summary

This is a case similar to DB/BD, 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 20548.Mar 6 2020, 5:21 AM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
750

Garbage?

marmoute added inline comments.Mar 6 2020, 1:10 PM
tests/test-copies-chain-merge.t
750

Garbage that went through the crack

martinvonz added inline comments.Mar 6 2020, 1:20 PM
tests/test-copies-chain-merge.t
357

could you make this "g-1: d update" or whatever the convention used elsewhere was?

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

series update after Martin feedback

martinvonz added inline comments.Mar 6 2020, 7:16 PM
tests/test-copies-chain-merge.t
379

I assume this will need to be update too. I can do that in flight.

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