comparison tests/test-resolve.t @ 34146: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 fce4ed2912bb
children 4441705b7111
comparison
equal deleted inserted replaced
34142:24bf823377fc 34146:9e4f82bc2b0b
253 merging file2 253 merging file2
254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') 254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') 255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
256 [1] 256 [1]
257 $ ls .hg/origbackups 257 $ ls .hg/origbackups
258 file1.orig 258 file1
259 file2.orig 259 file2
260 $ grep '<<<' file1 > /dev/null 260 $ grep '<<<' file1 > /dev/null
261 $ grep '<<<' file2 > /dev/null 261 $ grep '<<<' file2 > /dev/null
262 262
263 resolve <file> should re-merge file 263 resolve <file> should re-merge file
264 $ echo resolved > file1 264 $ echo resolved > file1