[Changed Subscribers] D9587: copies: reinstall initial empty files for chained copied

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Tue Jan 5 09:48:11 UTC 2021


pulkit added a comment.
pulkit added subscribers: mharbison72, durin42, pulkit.


  I had a meeting earlier with @marmoute today and we discussed this. After my discussion and reviewing this patch,  I understood:
  
  1. the motive is to test merging files that have same file content on both sides. So instead of empty files, we probably can have a version of this patch that writes out the same content.
  2. Having the same content is breaking tests for `changeset` case. Refer changes around line-354 on both sides.
  
  The 2) part makes me think that we should have tests for merging files with the same content. I don't have a strong opinion on how that should be done[1]. @durin42 @mharbison72 thoughts on that?
  
  @marmoute @martinvonz correct me if I got something wrong.
  
  [1]: IIRC, I pushed Martin's original patch which added content to files and though Pierre-Yves later commented against it, I didn't understand the hidden benefit that empty files were bringing i.e. merging files with the same content

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9587/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9587

To: marmoute, #hg-reviewers, martinvonz, Alphare
Cc: pulkit, durin42, mharbison72, Alphare, martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210105/7b64064b/attachment-0001.html>


More information about the Mercurial-patches mailing list