comparison hgext/pager.py @ 34158:9e4f82bc2b0b

scmutil: don't append .orig to backups in origbackuppath (BC) When ui.origbackuppath is set, .orig files are stored outside of the working copy, however they still have a .orig suffix appended to them. This can cause unexpected conflicts, particularly when tracked files or directories have .orig at the end. This change removes the .orig suffix from files stored in an out-of-tree origbackuppath. Test Plan: Update and run unit tests. Differential Revision: https://phab.mercurial-scm.org/D679
author Mark Thomas <mbthomas@fb.com>
date Mon, 11 Sep 2017 17:49:49 +0000
parents e83302d43748
children 6d1b0970f80c
comparison
equal deleted inserted replaced
34157:24bf823377fc 34158:9e4f82bc2b0b