martinvonz requested changes to this revision. martinvonz added inline comments. This revision now requires changes to proceed.
INLINE COMMENTS > filemerge.py:617-624 > + if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: > + # If the backup file is to be in the working directory, and we're > + # merging in-memory, we must redirect the backup to the memory > context > + # so we don't disturb the working directory. > + relpath = back[len(repo.wvfs.base) + 1:] > + wctx[relpath].write(fcd.data(), fcd.flags()) > + return wctx[relpath] I mentioned on IRC the other day that this *could* be left for another patch and that I didn't expect it to be here after reading the commit message. I didn't insist that had to be done, but Phil liked the idea, so he said he'd do it. I just thought I'd point that out here too to get the status right on the dashboard. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D674 To: phillco, #hg-reviewers, martinvonz Cc: sid0, martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
