Page MenuHomePhabricator

test-copies: don't use empty file for "same content" cases
ClosedPublic

Authored by marmoute on Mon, Feb 22, 9:33 AM.

Details

Summary

For main case (using filelog or sidedata), this lead to the following hash
change.

Changesets:

  • 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 → 319179230cc87769ab3a861ebffe7a534ebb3d85
  • 01c2f5eabdc4 → 319179230cc8
  • c72365ee036fca4fb27fd745459bfb6ea1ac6993 → 6cbc9c2b7b391dd738603173717c601648d3735f
  • c72365ee036f → 6cbc9c2b7b39

File revision for f:

  • 0dd616bc7ab1a111921d95d76f69cda5c2ac539c → cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e
  • 0dd616bc7ab1 → cedeacc5bf5d
  • eb806e34ef6be4c264effd5933d31004ad15a793 → ffb76cd765422a18759a335d8a81fa2bd455be6b
  • eb806e34ef6b → ffb76cd76542
  • 6da5a2eecb9c833f830b67a4972366d49a9a142c → 08d1ff5926fbd0285cdeb044cbe8ab651687e86a
  • 6da5a2eecb9c → 08d1ff5926fb

File revision for d:

  • 7bded9d9da1f7bf9bf7cbfb24fe1e6ccf68ec440 → ba177bbb45ea930ee48469a55d40224537bd57a9

For the "extra in changeset" case we get the following change for file d:

  • 68d5bca9df0577b6bc2ea30ca724e13ead60da81 → b894de5c94aadcb4894ea7c358389819c27fbcce
  • 68d5bca9df05 → b894de5c94aa
  • b80de5d138758541c5f05265ad144ab9fa86d1db → 56647659eff080e06e45c18ea9e848836dadea71
  • b80de5d13875 → 56647659eff0

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.Mon, Feb 22, 9:33 AM
Alphare added inline comments.
tests/test-copies-chain-merge.t
52

"but a new [...]" missing the subject here

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