D674: filemerge: use arbitraryfilectx for backup files
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Tue Sep 26 09:34:15 EDT 2017
phillco added a comment.
> One extra comment: maybe include some "why" as well as "what" in your commit message. :)
Sorry I missed this, the comment is very valid. Will send a new version.
INLINE COMMENTS
> martinvonz wrote in filemerge.py:611
> Isn't repo.wjoin(fcd.path()) the same thing as _workingpath(repo, fcd) inlined? You call the same thing further down, so why not keep the "a" variable (possibly renamed to something better)?
Yeah, not sure why I reverted to wjoin. I'll switch it back.
> martinvonz wrote in filemerge.py:616
> Why care whether it's in the working directory when doing in-memory merge? Why not instead always (when doing in-memory merge) either redirect the backup to memory or put it outside of the working directory? Is it so if a there's a conflict, it will get flushed to the place the user expects?
> Is it so if a there's a conflict, it will get flushed to the place the user expects?
Yes, basically.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D674
To: phillco, #hg-reviewers
Cc: sid0, martinvonz, mercurial-devel
More information about the Mercurial-devel
mailing list