##// END OF EJS Templates
copies: detect files as `touched/salvaged` if they only existed on one side...
copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

File last commit:

r41072:ce0bc295 default
r47570:c52c3c4c default
Show More
TODO.rst
21 lines | 782 B | text/x-rst | RstLexer

Address commentary in manifest.excludedmanifestrevlog.add - specifically we should improve the collaboration with core so that add() never gets called on an excluded directory and we can improve the stand-in to raise a ProgrammingError.

Reason more completely about rename-filtering logic in narrowfilelog. There could be some surprises lurking there.

Formally document the narrowspec format. For bonus points, unify with the server-specified narrowspec format.

narrowrepo.setnarrowpats() or narrowspec.save() need to make sure they're holding the wlock.

The follinwg places do an unrestricted dirstate walk (including files outside the narrowspec). Some of them should perhaps not do that.

  • debugfileset
  • perfwalk
  • sparse (but restricted to sparse config)
  • largefiles