Mercurial > public > mercurial-scm > hg

diff tests/test-merge-local.t @ 26941:454deda24315

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: choose where .orig files are kept Having .orig files litter your working copy is a common complaint. This patch uses cmdutil.orig to let the user determine where those files should reside.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 16:25:59 -0800
parents ef1eb6df7071
children 777f668eca70
line wrap: on
line diff
--- a/tests/test-merge-local.t	Tue Nov 10 14:29:13 2015 -0800
+++ b/tests/test-merge-local.t	Tue Nov 10 16:25:59 2015 -0800
@@ -91,7 +91,7 @@
   use 'hg resolve' to retry unresolved file merges
   [1]
 
-  $ hg co 0
+  $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
   merging zzz1_merge_ok
   merging zzz2_merge_bad
   warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
@@ -99,6 +99,10 @@
   use 'hg resolve' to retry unresolved file merges
   [1]
 
+Are orig files from the last commit where we want them?
+  $ ls .hg/origbackups
+  zzz2_merge_bad.orig
+
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok