##// END OF EJS Templates
filemerge: only write in-memory backup during premerge...
Phil Cohen -
r35721:9a50ffd1 default
parent child Browse files
Show More
@@ -636,7 +636,8 b' def _makebackup(repo, ui, wctx, fcd, pre'
636 # merging in-memory, we must redirect the backup to the memory context
636 # merging in-memory, we must redirect the backup to the memory context
637 # so we don't disturb the working directory.
637 # so we don't disturb the working directory.
638 relpath = back[len(repo.wvfs.base) + 1:]
638 relpath = back[len(repo.wvfs.base) + 1:]
639 wctx[relpath].write(fcd.data(), fcd.flags())
639 if premerge:
640 wctx[relpath].write(fcd.data(), fcd.flags())
640 return wctx[relpath]
641 return wctx[relpath]
641 else:
642 else:
642 if premerge:
643 if premerge:
General Comments 0
You need to be logged in to leave comments. Login now