[PATCH 2 of 4 V2] mergetools: add a tests for premerge --keep
pierre-yves.david at ens-lyon.org
pierre-yves.david at ens-lyon.org
Tue Aug 5 19:07:02 CDT 2014
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1407196215 25200
# Mon Aug 04 16:50:15 2014 -0700
# Node ID c59783e15c14e8c5417d379cebae1be0b815fdca
# Parent 3910d657c2e8553935ea0d531cefbf63ff76ca14
mergetools: add a tests for premerge --keep
It works! No surprise
diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -707,10 +707,43 @@ Default is silent simplemerge:
revision 1
space
# hg stat
M f
+.premerge=keep keeps conflict markers in:
+
+ $ beforemerge
+ [merge-tools]
+ false.whatever=
+ true.priority=1
+ true.executable=cat
+ # hg update -C 1
+ $ hg merge -r 4 --config merge-tools.true.premerge=keep
+ merging f
+ <<<<<<< local: ef83787e2614 - test: revision 1
+ revision 1
+ space
+ =======
+ revision 4
+ >>>>>>> other: 81448d39c9a0 - test: revision 4
+ revision 0
+ space
+ revision 4
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ aftermerge
+ # cat f
+ <<<<<<< local: ef83787e2614 - test: revision 1
+ revision 1
+ space
+ =======
+ revision 4
+ >>>>>>> other: 81448d39c9a0 - test: revision 4
+ # hg stat
+ M f
+
+
Tool execution
set tools.args explicit to include $base $local $other $output:
$ beforemerge
More information about the Mercurial-devel
mailing list