martinvonz added inline comments. INLINE COMMENTS
> filemerge.py:611 > + from . import context > + back = scmutil.origpath(ui, repo, repo.wjoin(fcd.path())) > 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)? > filemerge.py:616 > + > + if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: > + # If the backup file is to be in the working directory, and we're 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? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D674 To: phillco, #hg-reviewers Cc: sid0, martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel