Mercurial > hg
annotate tests/test-merge-tools.t @ 48966:b10a944c0486 stable
tests: demonstrate how conflict markers end up $local *and* $output
When a merge tool is configured to keep conflict markers, they are
supposed to be written to `$local` if `$output` is not mentioned in
the tool's `merge-tools.<tool>.args` config, and in `$output` if it is
mentioned. However, I broke the latter case in D12190.
Differential Revision: https://phab.mercurial-scm.org/D12378
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 15 Mar 2022 13:40:45 -0700 |
parents | 92254dcd9255 |
children | a54a866349ed |
rev | line source |
---|---|
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1 test merge-tools configuration - mostly exercising filemerge.py |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
3 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
40465
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
4 $ cat >> $HGRCPATH << EOF |
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
5 > [ui] |
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
6 > merge= |
43873
8caec25f5d8f
merge: add commands.merge.require-rev to require an argument to hg merge
Kyle Lippincott <spectral@google.com>
parents:
43738
diff
changeset
|
7 > [commands] |
8caec25f5d8f
merge: add commands.merge.require-rev to require an argument to hg merge
Kyle Lippincott <spectral@google.com>
parents:
43738
diff
changeset
|
8 > merge.require-rev=True |
40465
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
9 > EOF |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
10 $ hg init repo |
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
11 $ cd repo |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
12 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
13 revision 0 |
7731 | 14 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
15 $ echo "revision 0" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
16 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
17 $ hg commit -Am "revision 0" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
18 adding f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
19 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
20 revision 1 |
7731 | 21 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
22 $ echo "revision 1" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
23 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
24 $ hg commit -Am "revision 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
25 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
26 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
27 revision 2 |
7731 | 28 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
29 $ echo "revision 2" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
30 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
31 $ hg commit -Am "revision 2" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
32 created new head |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
33 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
34 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
35 revision 3 - simple to merge |
7731 | 36 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
37 $ echo "revision 3" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
38 $ hg commit -Am "revision 3" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
39 created new head |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
40 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
41 revision 4 - hard to merge |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
42 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
43 $ hg update 0 > /dev/null |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
44 $ echo "revision 4" > f |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
45 $ hg commit -Am "revision 4" |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
46 created new head |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
47 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
48 $ echo "[merge-tools]" > .hg/hgrc |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
49 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
50 $ beforemerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
51 > cat .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
52 > echo "# hg update -C 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
53 > hg update -C 1 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
54 > } |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
55 $ aftermerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
56 > echo "# cat f" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 > cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
58 > echo "# hg stat" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
59 > hg stat |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
60 > echo "# hg resolve --list" |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
61 > hg resolve --list |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
62 > rm -f f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
63 > } |
7731 | 64 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
65 Tool selection |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
66 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
67 default is internal merge: |
7731 | 68 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
69 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
70 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
71 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
73 hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
74 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
75 running from a devel copy, not a temp installation |
7731 | 76 |
43738
558f7585afcb
test: don't put $BINDIR in $PATH for test-merge-tools.t
Julien Cristau <jcristau@debian.org>
parents:
42565
diff
changeset
|
77 $ PATH="/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
78 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
79 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
80 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
81 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
82 [1] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
83 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
84 # cat f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
85 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
86 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
87 ======= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
88 revision 2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
89 >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
90 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
91 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
92 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
93 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
94 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
95 U f |
7731 | 96 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
97 simplest hgrc using false for merge: |
7731 | 98 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
99 $ echo "false.whatever=" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
100 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
101 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
102 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
103 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
104 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
105 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
106 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
107 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
108 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
109 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
110 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
111 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
112 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
113 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
114 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
115 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
116 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
117 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
118 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
119 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
120 #if unix-permissions |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
121 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
122 unexecutable file in $PATH shouldn't be found: |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
123 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
124 $ echo "echo fail" > false |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
125 $ hg up -qC 1 |
43738
558f7585afcb
test: don't put $BINDIR in $PATH for test-merge-tools.t
Julien Cristau <jcristau@debian.org>
parents:
42565
diff
changeset
|
126 $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
127 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
128 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
129 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
130 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
131 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
132 $ rm false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
133 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
134 #endif |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
135 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
136 executable directory in $PATH shouldn't be found: |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
137 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
138 $ mkdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
139 $ hg up -qC 1 |
43738
558f7585afcb
test: don't put $BINDIR in $PATH for test-merge-tools.t
Julien Cristau <jcristau@debian.org>
parents:
42565
diff
changeset
|
140 $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
141 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
142 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
143 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
144 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
145 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
146 $ rmdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
147 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
148 true with higher .priority gets precedence: |
7731 | 149 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
150 $ echo "true.priority=1" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
151 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
152 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
153 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
154 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
155 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
156 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
157 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
158 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
159 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
160 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
161 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
162 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
163 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
164 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
165 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
166 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
167 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
168 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
169 unless lowered on command line: |
7731 | 170 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
171 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
172 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
173 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
174 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
175 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
176 $ hg merge -r 2 --config merge-tools.true.priority=-7 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
177 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
178 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
180 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
181 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
182 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
183 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
184 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
185 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
186 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
187 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
188 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
189 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
190 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
191 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
192 or false set higher on command line: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
193 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
194 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
195 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
196 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
197 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
198 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
199 $ hg merge -r 2 --config merge-tools.false.priority=117 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
200 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
201 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
202 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
203 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
204 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
205 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
206 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
207 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
208 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
209 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
210 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
211 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
212 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
213 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
214 |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
215 or true set to disabled: |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
216 $ beforemerge |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
217 [merge-tools] |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
218 false.whatever= |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
219 true.priority=1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
220 # hg update -C 1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
221 $ hg merge -r 2 --config merge-tools.true.disabled=yes |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
222 merging f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
223 merging f failed! |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
224 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
225 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
226 [1] |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
227 $ aftermerge |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
228 # cat f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
229 revision 1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
230 space |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
231 # hg stat |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
232 M f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
233 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
234 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
235 U f |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
236 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
237 or true.executable not found in PATH: |
7731 | 238 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
239 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
240 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
241 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
242 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
243 # hg update -C 1 |
17492 | 244 $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
245 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
246 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
247 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
248 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
249 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
250 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
251 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
252 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
253 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
254 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
255 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
256 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
257 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
258 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
259 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
260 or true.executable with bogus path: |
7731 | 261 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
262 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
263 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
264 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
265 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
266 # hg update -C 1 |
17492 | 267 $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
268 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
269 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
270 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
271 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
272 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
273 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
274 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
275 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
276 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
277 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
278 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
279 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
280 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
281 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
282 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
283 but true.executable set to cat found in PATH works: |
7731 | 284 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
285 $ echo "true.executable=cat" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
286 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
287 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
288 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
289 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
290 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
291 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
292 $ hg merge -r 2 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
293 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
294 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
295 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
296 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
297 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
298 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
299 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
300 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
301 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
302 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
303 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
304 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
305 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
306 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
307 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
308 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
309 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
310 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
311 and true.executable set to cat with path works: |
7731 | 312 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
313 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
314 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
315 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
316 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
317 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
318 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
319 $ hg merge -r 2 --config merge-tools.true.executable=cat |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
320 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
321 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
322 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
323 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
324 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
325 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
326 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
328 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
329 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
330 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
331 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
332 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
333 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
334 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
335 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
336 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
337 |
38041
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
338 executable set to python script that succeeds: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
339 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
340 $ cat > "$TESTTMP/myworkingmerge.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
341 > def myworkingmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
342 > return False |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
343 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
344 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
345 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
346 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
347 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
348 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
349 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
350 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:myworkingmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
351 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
352 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
353 (branch merge, don't forget to commit) |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
354 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
355 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
356 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
357 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
358 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
359 M f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
360 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
361 R f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
362 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
363 executable set to python script that fails: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
364 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
365 $ cat > "$TESTTMP/mybrokenmerge.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
366 > def mybrokenmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
367 > ui.write(b"some fail message\n") |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
368 > return True |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
369 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
370 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
371 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
372 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
373 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
374 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
375 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
376 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/mybrokenmerge.py:mybrokenmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
377 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
378 some fail message |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
379 abort: $TESTTMP/mybrokenmerge.py hook failed |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
46139
diff
changeset
|
380 [40] |
38041
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
381 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
382 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
383 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
384 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
385 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
386 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
387 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
388 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
389 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
390 executable set to python script that is missing function: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
391 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
392 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
393 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
394 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
395 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
396 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
397 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
398 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:missingFunction" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
399 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
400 abort: $TESTTMP/myworkingmerge.py does not have function: missingFunction |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
401 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
402 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
403 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
404 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
405 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
406 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
407 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
408 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
409 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
410 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
411 executable set to missing python script: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
412 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
413 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
414 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
415 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
416 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
417 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
418 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
419 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/missingpythonscript.py:mergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
420 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
421 abort: loading python merge script failed: $TESTTMP/missingpythonscript.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
422 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
423 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
424 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
425 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
426 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
427 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
428 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
429 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
430 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
431 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
432 executable set to python script but callable function is missing: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
433 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
434 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
435 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
436 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
437 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
438 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
439 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
440 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
441 abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
442 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
443 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
444 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
445 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
446 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
447 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
448 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
449 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
450 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
451 executable set to python script but callable function is empty string: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
452 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
453 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
454 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
455 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
456 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
457 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
458 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
459 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
460 abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
461 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
462 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
463 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
464 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
465 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
466 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
467 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
468 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
469 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
470 executable set to python script but callable function is missing and path contains colon: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
471 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
472 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
473 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
474 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
475 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
476 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
477 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
478 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/some:dir/myworkingmerge.py" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
479 abort: invalid 'python:' syntax: python:$TESTTMP/some:dir/myworkingmerge.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
480 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
481 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
482 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
483 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
484 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
485 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
486 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
487 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
488 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
489 executable set to python script filename that contains spaces: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
490 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
491 $ mkdir -p "$TESTTMP/my path" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
492 $ cat > "$TESTTMP/my path/my working merge with spaces in filename.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
493 > def myworkingmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
494 > return False |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
495 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
496 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
497 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
498 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
499 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
500 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
501 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
502 $ hg merge -r 2 --config "merge-tools.true.executable=python:$TESTTMP/my path/my working merge with spaces in filename.py:myworkingmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
503 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
504 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
505 (branch merge, don't forget to commit) |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
506 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
507 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
508 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
509 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
510 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
511 M f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
512 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
513 R f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
514 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
515 #if unix-permissions |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
516 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
517 environment variables in true.executable are handled: |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
518 |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
519 $ echo 'echo "custom merge tool"' > .hg/merge.sh |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
520 $ beforemerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
521 [merge-tools] |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
522 false.whatever= |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
523 true.priority=1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
524 true.executable=cat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
525 # hg update -C 1 |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
526 $ hg --config merge-tools.true.executable='sh' \ |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
527 > --config merge-tools.true.args=.hg/merge.sh \ |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
528 > merge -r 2 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
529 merging f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
530 custom merge tool |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
531 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
532 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
533 $ aftermerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
534 # cat f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
535 revision 1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
536 space |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
537 # hg stat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
538 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
539 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
540 R f |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
541 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
542 #endif |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
543 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
544 Tool selection and merge-patterns |
7731 | 545 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
546 merge-patterns specifies new tool false: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
547 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
548 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
549 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
550 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
551 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
552 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
553 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
554 $ hg merge -r 2 --config merge-patterns.f=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
555 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
556 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
557 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
558 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
559 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
560 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
561 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
562 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
563 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
564 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
565 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
566 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
567 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
568 U f |
7731 | 569 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
570 merge-patterns specifies executable not found in PATH and gets warning: |
7731 | 571 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
572 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
573 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
574 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
575 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
576 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
577 # hg update -C 1 |
17492 | 578 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
579 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
580 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
581 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
582 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
583 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
584 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
585 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
586 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
587 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
588 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
589 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
590 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
591 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
592 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
593 U f |
7731 | 594 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
595 merge-patterns specifies executable with bogus path and gets warning: |
7731 | 596 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
597 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
598 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
599 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
600 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
601 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
602 # hg update -C 1 |
17492 | 603 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
604 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
605 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
606 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
607 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
608 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
609 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
610 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
611 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
612 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
613 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
614 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
615 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
616 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
617 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
618 U f |
7731 | 619 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
620 ui.merge overrules priority |
7731 | 621 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
622 ui.merge specifies false: |
7731 | 623 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
624 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
625 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
626 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
627 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
628 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
629 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
630 $ hg merge -r 2 --config ui.merge=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
631 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
632 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
633 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
634 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
635 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
636 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
637 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
638 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
639 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
640 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
641 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
642 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
643 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
644 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
645 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
646 ui.merge specifies internal:fail: |
7731 | 647 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
648 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
649 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
650 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
651 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
652 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
653 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
654 $ hg merge -r 2 --config ui.merge=internal:fail |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
655 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
656 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
657 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
658 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
659 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
660 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
661 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
662 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
663 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
664 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
665 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
666 |
22706
ad25986c4cd3
filemerge: introduce :x as short version of internal:x merge tool name
Mads Kiilerich <madski@unity3d.com>
parents:
22032
diff
changeset
|
667 ui.merge specifies :local (without internal prefix): |
7731 | 668 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
669 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
670 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
671 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
672 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
673 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
674 # hg update -C 1 |
22706
ad25986c4cd3
filemerge: introduce :x as short version of internal:x merge tool name
Mads Kiilerich <madski@unity3d.com>
parents:
22032
diff
changeset
|
675 $ hg merge -r 2 --config ui.merge=:local |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
676 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
677 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
678 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
679 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
680 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
681 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
682 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
683 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
684 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
685 R f |
7731 | 686 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
687 ui.merge specifies internal:other: |
7731 | 688 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
689 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
690 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
691 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
692 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
693 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
694 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
695 $ hg merge -r 2 --config ui.merge=internal:other |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
696 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
697 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
698 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
699 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
700 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
701 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
702 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
703 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
704 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
705 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
706 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
707 ui.merge specifies internal:prompt: |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
708 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
709 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
710 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
711 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
712 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
713 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
714 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
715 $ hg merge -r 2 --config ui.merge=internal:prompt |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
716 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
717 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
718 What do you want to do? u |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
719 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
720 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
721 [1] |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
722 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
723 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
724 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
725 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
726 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
727 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
728 # hg resolve --list |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
729 U f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
730 |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
731 ui.merge specifies :prompt, with 'leave unresolved' chosen |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
732 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
733 $ beforemerge |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
734 [merge-tools] |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
735 false.whatever= |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
736 true.priority=1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
737 true.executable=cat |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
738 # hg update -C 1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
739 $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
740 > u |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
741 > EOF |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
742 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
743 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
744 What do you want to do? u |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
745 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
746 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
747 [1] |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
748 $ aftermerge |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
749 # cat f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
750 revision 1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
751 space |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
752 # hg stat |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
753 M f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
754 # hg resolve --list |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
755 U f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
756 |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
757 prompt with EOF |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
758 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
759 $ beforemerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
760 [merge-tools] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
761 false.whatever= |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
762 true.priority=1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
763 true.executable=cat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
764 # hg update -C 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
765 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
766 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
767 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
768 What do you want to do? |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
769 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
770 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
771 [1] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
772 $ aftermerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
773 # cat f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
774 revision 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
775 space |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
776 # hg stat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
777 M f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
778 # hg resolve --list |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
779 U f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
780 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
781 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
782 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
783 What do you want to do? |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
784 [1] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
785 $ aftermerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
786 # cat f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
787 revision 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
788 space |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
789 # hg stat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
790 M f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
791 ? f.orig |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
792 # hg resolve --list |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
793 U f |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
794 $ rm f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
795 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
796 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
797 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
798 What do you want to do? |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
799 [1] |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
800 $ aftermerge |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
801 # cat f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
802 revision 1 |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
803 space |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
804 # hg stat |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
805 M f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
806 # hg resolve --list |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
807 U f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
808 $ hg resolve --all --config ui.merge=internal:prompt |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
809 file 'f' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
810 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
811 What do you want to do? u |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
812 [1] |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
813 $ aftermerge |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
814 # cat f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
815 revision 1 |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
816 space |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
817 # hg stat |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
818 M f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
819 ? f.orig |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
820 # hg resolve --list |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
821 U f |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
822 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
823 ui.merge specifies internal:dump: |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
824 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
825 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
826 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
827 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
828 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
829 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
830 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
831 $ hg merge -r 2 --config ui.merge=internal:dump |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
832 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
833 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
834 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
835 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
836 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
837 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
838 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
839 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
840 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
841 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
842 ? f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
843 ? f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
844 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
845 ? f.other |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
846 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
847 U f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
848 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
849 f.base: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
850 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
851 $ cat f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
852 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
853 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
854 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
855 f.local: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
856 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
857 $ cat f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
858 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
859 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
860 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
861 f.other: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
862 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
863 $ cat f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
864 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
865 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
866 $ rm f.base f.local f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
867 |
32255
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
868 check that internal:dump doesn't dump files if premerge runs |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
869 successfully |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
870 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
871 $ beforemerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
872 [merge-tools] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
873 false.whatever= |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
874 true.priority=1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
875 true.executable=cat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
876 # hg update -C 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
877 $ hg merge -r 3 --config ui.merge=internal:dump |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
878 merging f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
879 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
880 (branch merge, don't forget to commit) |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
881 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
882 $ aftermerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
883 # cat f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
884 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
885 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
886 revision 3 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
887 # hg stat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
888 M f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
889 # hg resolve --list |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
890 R f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
891 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
892 check that internal:forcedump dumps files, even if local and other can |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
893 be merged easily |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
894 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
895 $ beforemerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
896 [merge-tools] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
897 false.whatever= |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
898 true.priority=1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
899 true.executable=cat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
900 # hg update -C 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
901 $ hg merge -r 3 --config ui.merge=internal:forcedump |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
902 merging f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
903 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
904 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
32255
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
905 [1] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
906 $ aftermerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
907 # cat f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
908 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
909 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
910 # hg stat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
911 M f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
912 ? f.base |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
913 ? f.local |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
914 ? f.orig |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
915 ? f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
916 # hg resolve --list |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
917 U f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
918 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
919 $ cat f.base |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
920 revision 0 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
921 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
922 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
923 $ cat f.local |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
924 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
925 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
926 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
927 $ cat f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
928 revision 0 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
929 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
930 revision 3 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
931 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
932 $ rm -f f.base f.local f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
933 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
934 ui.merge specifies internal:other but is overruled by pattern for false: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
935 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
936 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
937 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
938 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
939 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
940 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
941 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
942 $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
943 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
944 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
945 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
946 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
947 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
948 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
949 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
950 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
951 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
952 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
953 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
954 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
955 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
956 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
957 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
958 Premerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
959 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
960 ui.merge specifies internal:other but is overruled by --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
961 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
962 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
963 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
964 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
965 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
966 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
967 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
968 $ hg merge -r 2 --config ui.merge=internal:other --tool=false |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
969 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
970 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
971 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
972 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
973 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
974 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
975 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
976 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
977 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
978 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
979 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
980 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
981 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
982 U f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
983 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
984 HGMERGE specifies internal:other but is overruled by --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
985 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
986 $ HGMERGE=internal:other ; export HGMERGE |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
987 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
988 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
989 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
990 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
991 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
992 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
993 $ hg merge -r 2 --tool=false |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
994 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
995 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
996 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
997 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
998 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
999 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1000 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1001 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1002 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1003 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1004 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1005 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1006 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1007 U f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1008 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1009 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
1010 |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1011 update is a merge ... |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1012 |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1013 (this also tests that files reverted with '--rev REV' are treated as |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1014 "modified", even if none of mode, size and timestamp of them isn't |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1015 changed on the filesystem (see also issue4583)) |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1016 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1017 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1018 > [fakedirstatewritetime] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1019 > # emulate invoking dirstate.write() via repo.status() |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1020 > # at 2000-01-01 00:00 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1021 > fakenow = 200001010000 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1022 > EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1023 |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1024 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1025 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1026 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1027 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1028 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1029 # hg update -C 1 |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1030 $ hg update -q 0 |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1031 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1032 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1033 $ touch -t 200001010000 f |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1034 $ hg debugrebuildstate |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1035 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1036 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1037 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1038 > EOF |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1039 $ hg revert -q -r 1 . |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1040 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1041 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1042 > fakedirstatewritetime = ! |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1043 > EOF |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1044 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1045 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1046 $ touch -t 200001010000 f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1047 $ hg status f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1048 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1049 $ hg update -r 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1050 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1051 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1052 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1053 revision 0 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1054 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1055 revision 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1056 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1057 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1058 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1059 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1060 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1061 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1062 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1063 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1064 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1065 R f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1066 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1067 update should also have --tool |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1068 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1069 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1070 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1071 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1072 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1073 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1074 # hg update -C 1 |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1075 $ hg update -q 0 |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1076 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1077 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1078 $ touch -t 200001010000 f |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1079 $ hg debugrebuildstate |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1080 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1081 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1082 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1083 > EOF |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1084 $ hg revert -q -r 1 . |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1085 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1086 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1087 > fakedirstatewritetime = ! |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1088 > EOF |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1089 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1090 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1091 $ touch -t 200001010000 f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1092 $ hg status f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1093 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1094 $ hg update -r 2 --tool false |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1095 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1096 merging f failed! |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1097 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1098 use 'hg resolve' to retry unresolved file merges |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1099 [1] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1100 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1101 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1102 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1103 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1104 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1105 M f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1106 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1107 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1108 U f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1109 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1110 Default is silent simplemerge: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
1111 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1112 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1113 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1114 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1115 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1116 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1117 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1118 $ hg merge -r 3 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1119 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1120 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1121 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1122 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1123 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1124 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1125 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1126 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1127 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1128 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1129 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1130 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1131 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1132 .premerge=True is same: |
7731 | 1133 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1134 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1135 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1136 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1137 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1138 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1139 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1140 $ hg merge -r 3 --config merge-tools.true.premerge=True |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1141 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1142 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1143 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1144 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1145 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1146 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1147 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1148 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1149 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1150 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1151 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1152 R f |
7731 | 1153 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1154 .premerge=False executes merge-tool: |
7731 | 1155 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1156 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1157 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1158 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1159 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1160 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1161 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1162 $ hg merge -r 3 --config merge-tools.true.premerge=False |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1163 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1164 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1165 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1166 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1167 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1168 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1169 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1170 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1171 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1172 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1173 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1174 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1175 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1176 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1177 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1178 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1179 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1180 R f |
7731 | 1181 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1182 premerge=keep keeps conflict markers in: |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1183 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1184 $ beforemerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1185 [merge-tools] |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1186 false.whatever= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1187 true.priority=1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1188 true.executable=cat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1189 # hg update -C 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1190 $ hg merge -r 4 --config merge-tools.true.premerge=keep |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1191 merging f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1192 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1193 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1194 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1195 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1196 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1197 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1198 revision 0 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1199 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1200 revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1201 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1202 (branch merge, don't forget to commit) |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1203 $ aftermerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1204 # cat f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1205 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1206 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1207 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1208 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1209 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1210 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1211 # hg stat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1212 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1213 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1214 R f |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1215 |
48966
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1216 with premerge=keep and $output in tool args, $local does not have markers: |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1217 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1218 $ beforemerge |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1219 [merge-tools] |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1220 false.whatever= |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1221 true.priority=1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1222 true.executable=cat |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1223 # hg update -C 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1224 $ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output' |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1225 merging f |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1226 revision 0 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1227 space |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1228 <<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !) |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1229 revision 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1230 space |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1231 ======= (known-bad-output !) |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1232 revision 4 (known-bad-output !) |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1233 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 (known-bad-output !) |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1234 revision 4 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1235 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1236 revision 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1237 space |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1238 ======= |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1239 revision 4 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1240 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1241 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1242 (branch merge, don't forget to commit) |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1243 $ aftermerge |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1244 # cat f |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1245 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1246 revision 1 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1247 space |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1248 ======= |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1249 revision 4 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1250 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1251 # hg stat |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1252 M f |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1253 # hg resolve --list |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1254 R f |
b10a944c0486
tests: demonstrate how conflict markers end up $local *and* $output
Martin von Zweigbergk <martinvonz@google.com>
parents:
48802
diff
changeset
|
1255 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1256 premerge=keep-merge3 keeps conflict markers with base content: |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1257 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1258 $ beforemerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1259 [merge-tools] |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1260 false.whatever= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1261 true.priority=1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1262 true.executable=cat |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1263 # hg update -C 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1264 $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1265 merging f |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1266 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1267 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1268 space |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1269 ||||||| common ancestor: ffd2bda21d6e - test: revision 0 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1270 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1271 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1272 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1273 revision 4 |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1274 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1275 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1276 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1277 revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1278 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1279 (branch merge, don't forget to commit) |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1280 $ aftermerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1281 # cat f |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1282 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1283 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1284 space |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1285 ||||||| common ancestor: ffd2bda21d6e - test: revision 0 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1286 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1287 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1288 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1289 revision 4 |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1290 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1291 # hg stat |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1292 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1293 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1294 R f |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1295 |
46139
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1296 premerge=keep-mergediff keeps conflict markers with base content: |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1297 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1298 $ beforemerge |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1299 [merge-tools] |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1300 false.whatever= |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1301 true.priority=1 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1302 true.executable=cat |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1303 # hg update -C 1 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1304 $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1305 merging f |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1306 <<<<<<< |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1307 ------- common ancestor: ffd2bda21d6e - test: revision 0 |
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1308 +++++++ working copy: ef83787e2614 - test: revision 1 |
46139
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1309 -revision 0 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1310 +revision 1 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1311 space |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1312 ======= merge rev: 81448d39c9a0 - test: revision 4 |
46139
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1313 revision 4 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1314 >>>>>>> |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1315 revision 0 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1316 space |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1317 revision 4 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1318 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1319 (branch merge, don't forget to commit) |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1320 $ aftermerge |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1321 # cat f |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1322 <<<<<<< |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1323 ------- common ancestor: ffd2bda21d6e - test: revision 0 |
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1324 +++++++ working copy: ef83787e2614 - test: revision 1 |
46139
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1325 -revision 0 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1326 +revision 1 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1327 space |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
1328 ======= merge rev: 81448d39c9a0 - test: revision 4 |
46139
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1329 revision 4 |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1330 >>>>>>> |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1331 # hg stat |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1332 M f |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1333 # hg resolve --list |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1334 R f |
3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
Martin von Zweigbergk <martinvonz@google.com>
parents:
45812
diff
changeset
|
1335 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1336 premerge=keep respects ui.mergemarkers=basic: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1337 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1338 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1339 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1340 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1341 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1342 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1343 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1344 $ hg merge -r 4 --config merge-tools.true.premerge=keep --config ui.mergemarkers=basic |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1345 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1346 <<<<<<< working copy |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1347 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1348 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1349 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1350 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1351 >>>>>>> merge rev |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1352 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1353 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1354 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1355 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1356 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1357 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1358 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1359 <<<<<<< working copy |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1360 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1361 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1362 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1363 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1364 >>>>>>> merge rev |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1365 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1366 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1367 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1368 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1369 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1370 premerge=keep ignores ui.mergemarkers=basic if true.mergemarkers=detailed: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1371 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1372 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1373 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1374 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1375 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1376 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1377 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1378 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1379 > --config ui.mergemarkers=basic \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1380 > --config merge-tools.true.mergemarkers=detailed |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1381 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1382 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1383 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1384 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1385 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1386 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1387 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1388 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1389 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1390 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1391 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1392 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1393 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1394 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1395 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1396 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1397 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1398 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1399 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1400 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1401 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1402 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1403 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1404 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1405 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1406 premerge=keep respects ui.mergemarkertemplate instead of |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1407 true.mergemarkertemplate if true.mergemarkers=basic: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1408 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1409 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1410 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1411 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1412 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1413 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1414 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1415 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1416 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1417 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1418 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1419 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1420 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1421 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1422 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1423 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1424 >>>>>>> merge rev: uitmpl 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1425 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1426 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1427 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1428 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1429 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1430 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1431 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1432 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1433 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1434 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1435 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1436 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1437 >>>>>>> merge rev: uitmpl 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1438 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1439 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1440 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1441 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1442 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1443 premerge=keep respects true.mergemarkertemplate instead of |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1444 true.mergemarkertemplate if true.mergemarkers=detailed: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1445 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1446 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1447 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1448 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1449 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1450 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1451 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1452 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1453 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1454 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1455 > --config merge-tools.true.mergemarkers=detailed |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1456 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1457 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1458 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1459 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1460 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1461 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1462 >>>>>>> merge rev: tooltmpl 81448d39c9a0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1463 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1464 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1465 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1466 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1467 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1468 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1469 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1470 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1471 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1472 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1473 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1474 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1475 >>>>>>> merge rev: tooltmpl 81448d39c9a0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1476 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1477 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1478 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1479 R f |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1480 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1481 Tool execution |
7731 | 1482 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1483 set tools.args explicit to include $base $local $other $output: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1484 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1485 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1486 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1487 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1488 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1489 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1490 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1491 $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1492 > | sed 's,==> .* <==,==> ... <==,g' |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1493 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1494 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1495 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1496 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1497 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1498 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1499 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1500 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1501 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1502 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1503 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1504 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1505 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1506 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1507 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1508 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1509 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1510 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1511 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1512 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1513 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1514 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1515 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1516 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1517 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1518 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1519 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1520 Merge with "echo mergeresult > $local": |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1521 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1522 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1523 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1524 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1525 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1526 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1527 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1528 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1529 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1530 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1531 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1532 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1533 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1534 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1535 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1536 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1537 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1538 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1539 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1540 - and $local is the file f: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1541 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1542 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1543 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1544 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1545 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1546 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1547 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1548 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1549 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1550 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1551 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1552 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1553 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1554 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1555 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1556 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1557 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1558 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1559 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1560 Merge with "echo mergeresult > $output" - the variable is a bit magic: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1561 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1562 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1563 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1564 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1565 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1566 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1567 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1568 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1569 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1570 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1571 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1572 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1573 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1574 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1575 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1576 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1577 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1578 R f |
7731 | 1579 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1580 Merge using tool with a path that must be quoted: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1581 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1582 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1583 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1584 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1585 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1586 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1587 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1588 $ cat <<EOF > 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1589 > cat "\$1" "\$2" "\$3" > "\$4" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1590 > EOF |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1591 $ hg --config merge-tools.true.executable='sh' \ |
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1592 > --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \ |
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1593 > merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1594 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1595 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1596 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1597 $ rm -f 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1598 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1599 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1600 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1601 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1602 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1603 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1604 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1605 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1606 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1607 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1608 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1609 R f |
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
1610 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1611 Merge using a tool that supports labellocal, labelother, and labelbase, checking |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1612 that they're quoted properly as well. This is using the default 'basic' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1613 mergemarkers even though ui.mergemarkers is 'detailed', so it's ignoring both |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1614 mergemarkertemplate settings: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1615 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1616 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1617 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1618 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1619 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1620 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1621 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1622 $ cat <<EOF > printargs_merge_tool |
48575
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1623 > while test \$# -gt 0; do echo arg: \""\$1"\"; shift; done |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1624 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1625 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1626 > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1627 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1628 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1629 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1630 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1631 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1632 arg: "ll:working copy" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1633 arg: "lo:" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1634 arg: "merge rev" |
48802
92254dcd9255
windows: adjust test output in test-merge-tools.t
Raphaël Gomès <rgomes@octobus.net>
parents:
48772
diff
changeset
|
1635 arg: "lb:common ancestor*/f~base" (glob) (no-windows !) |
92254dcd9255
windows: adjust test output in test-merge-tools.t
Raphaël Gomès <rgomes@octobus.net>
parents:
48772
diff
changeset
|
1636 arg: "lb:common ancestor*\f~base" (glob) (windows !) |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1637 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1638 (branch merge, don't forget to commit) |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1639 $ rm -f 'printargs_merge_tool' |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1640 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1641 Merge using a tool that supports labellocal, labelother, and labelbase, checking |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1642 that they're quoted properly as well. This is using 'detailed' mergemarkers, |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1643 even though ui.mergemarkers is 'basic', and using the tool's |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1644 mergemarkertemplate: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1645 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1646 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1647 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1648 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1649 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1650 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1651 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1652 $ cat <<EOF > printargs_merge_tool |
48575
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1653 > while test \$# -gt 0; do echo arg: \""\$1"\"; shift; done |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1654 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1655 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1656 > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1657 > --config merge-tools.true.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1658 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1659 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1660 > --config ui.mergemarkers=basic \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1661 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1662 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1663 arg: "ll:working copy: tooltmpl ef83787e2614" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1664 arg: "lo:" |
48587
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48584
diff
changeset
|
1665 arg: "merge rev: tooltmpl 0185f4e0cf02" |
48802
92254dcd9255
windows: adjust test output in test-merge-tools.t
Raphaël Gomès <rgomes@octobus.net>
parents:
48772
diff
changeset
|
1666 arg: "lb:common ancestor*/f~base" (glob) (no-windows !) |
92254dcd9255
windows: adjust test output in test-merge-tools.t
Raphaël Gomès <rgomes@octobus.net>
parents:
48772
diff
changeset
|
1667 arg: "lb:common ancestor*\f~base" (glob) (windows !) |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1668 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1669 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1670 $ rm -f 'printargs_merge_tool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1671 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1672 The merge tool still gets labellocal and labelother as 'basic' even when |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1673 premerge=keep is used and has 'detailed' markers: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1674 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1675 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1676 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1677 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1678 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1679 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1680 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1681 $ cat <<EOF > mytool |
48575
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1682 > echo labellocal: \""\$1"\" |
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1683 > echo labelother: \""\$2"\" |
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1684 > echo "output (arg)": \""\$3"\" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1685 > echo "output (contents)": |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1686 > cat "\$3" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1687 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1688 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1689 > --config merge-tools.true.args='mytool $labellocal $labelother $output' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1690 > --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1691 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1692 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1693 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1694 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1695 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1696 labellocal: "working copy" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1697 labelother: "merge rev" |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1698 output (arg): "$TESTTMP/repo/f" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1699 output (contents): |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1700 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1701 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1702 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1703 revision 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1704 >>>>>>> merge rev: uitmpl 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1705 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1706 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1707 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1708 $ rm -f 'mytool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1709 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1710 premerge=keep uses the *tool's* mergemarkertemplate if tool's |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1711 mergemarkers=detailed; labellocal and labelother also use the tool's template |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1712 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1713 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1714 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1715 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1716 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1717 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1718 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1719 $ cat <<EOF > mytool |
48575
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1720 > echo labellocal: \""\$1"\" |
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1721 > echo labelother: \""\$2"\" |
c852950f0e72
tests: also test spaces in conflict marker labels
Martin von Zweigbergk <martinvonz@google.com>
parents:
48431
diff
changeset
|
1722 > echo "output (arg)": \""\$3"\" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1723 > echo "output (contents)": |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1724 > cat "\$3" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1725 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1726 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1727 > --config merge-tools.true.args='mytool $labellocal $labelother $output' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1728 > --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1729 > --config merge-tools.true.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1730 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1731 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1732 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1733 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1734 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1735 labellocal: "working copy: tooltmpl ef83787e2614" |
48587
3c8cc987672e
simplemerge: take over formatting of label from `filemerge`
Martin von Zweigbergk <martinvonz@google.com>
parents:
48584
diff
changeset
|
1736 labelother: "merge rev: tooltmpl 0185f4e0cf02" |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1737 output (arg): "$TESTTMP/repo/f" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1738 output (contents): |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1739 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1740 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1741 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1742 revision 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1743 >>>>>>> merge rev: tooltmpl 0185f4e0cf02 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1744 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1745 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1746 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1747 $ rm -f 'mytool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1748 |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1749 Issue3581: Merging a filename that needs to be quoted |
17902
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1750 (This test doesn't work on Windows filesystems even on Linux, so check |
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1751 for Unix-like permission) |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1752 |
17902
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1753 #if unix-permissions |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1754 $ beforemerge |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1755 [merge-tools] |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1756 false.whatever= |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1757 true.priority=1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1758 true.executable=cat |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1759 # hg update -C 1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1760 $ echo "revision 5" > '"; exit 1; echo "' |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1761 $ hg commit -Am "revision 5" |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1762 adding "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1763 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1764 $ hg update -C 1 > /dev/null |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1765 $ echo "revision 6" > '"; exit 1; echo "' |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1766 $ hg commit -Am "revision 6" |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1767 adding "; exit 1; echo " |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1768 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1769 created new head |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1770 $ hg merge --config merge-tools.true.executable="true" -r 5 |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1771 merging "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1772 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1773 (branch merge, don't forget to commit) |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1774 $ hg update -C 1 > /dev/null |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1775 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1776 #else |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1777 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1778 Match the non-portable filename commits above for test stability |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1779 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1780 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1781 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1782 > revision 5 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1783 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1784 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1785 > new file mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1786 > --- /dev/null |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1787 > +++ b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1788 > @@ -0,0 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1789 > +revision 5 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1790 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1791 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1792 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1793 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1794 > revision 6 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1795 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1796 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1797 > new file mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1798 > --- /dev/null |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1799 > +++ b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1800 > @@ -0,0 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1801 > +revision 6 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1802 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1803 |
17901
a19046744e4e
filemerge: only run test for issue3581 on non-windows environments
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17885
diff
changeset
|
1804 #endif |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1805 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1806 Merge post-processing |
7731 | 1807 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1808 cat is a bad merge-tool and doesn't change: |
7731 | 1809 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1810 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1811 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1812 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1813 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1814 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1815 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1816 $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1817 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1818 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1819 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1820 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1821 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1822 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1823 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1824 output file f appears unchanged |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1825 was merge successful (yn)? n |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1826 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1827 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
1828 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1829 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1830 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1831 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1832 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1833 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1834 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1835 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1836 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1837 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1838 U f |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1839 |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1840 missingbinary is a merge-tool that doesn't exist: |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1841 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1842 $ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1843 $ beforemerge |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1844 [merge-tools] |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1845 false.whatever= |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1846 true.priority=1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1847 true.executable=cat |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1848 missingbinary.executable=doesnotexist |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1849 # hg update -C 1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1850 $ hg merge -y -r 2 --config ui.merge=missingbinary |
38952
0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
Martin von Zweigbergk <martinvonz@google.com>
parents:
38951
diff
changeset
|
1851 couldn't find merge tool missingbinary (for pattern f) |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1852 merging f |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1853 revision 1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1854 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1855 revision 0 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1856 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1857 revision 2 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1858 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1859 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1860 (branch merge, don't forget to commit) |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1861 |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1862 $ hg update -q -C 1 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1863 $ rm f |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1864 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1865 internal merge cannot handle symlinks and shouldn't try: |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1866 |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1867 #if symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1868 |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1869 $ ln -s symlink f |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1870 $ hg commit -qm 'f is symlink' |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1871 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1872 #else |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1873 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1874 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1875 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1876 > f is symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1877 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1878 > diff --git a/f b/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1879 > old mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1880 > new mode 120000 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1881 > --- a/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1882 > +++ b/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1883 > @@ -1,2 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1884 > -revision 1 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1885 > -space |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1886 > +symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1887 > \ No newline at end of file |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1888 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1889 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1890 Resolve 'other [destination] changed f which local [working copy] deleted' prompt |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1891 $ hg up -q -C --config ui.interactive=True << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1892 > c |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1893 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1894 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1895 #endif |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1896 |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1897 $ hg merge -r 2 --tool internal:merge |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1898 merging f |
22707
38e0363dcbe0
filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents:
22706
diff
changeset
|
1899 warning: internal :merge cannot merge symlinks for f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
1900 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1901 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
1902 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1903 [1] |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1904 |
30538
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1905 Verify naming of temporary files and that extension is preserved: |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1906 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1907 $ hg update -q -C 1 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1908 $ hg mv f f.txt |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1909 $ hg ci -qm "f.txt" |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1910 $ hg update -q -C 2 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1911 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1912 merging f and f.txt to f.txt |
48772
b70c9697ab41
filemerge: put temporary files in single temp dir by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
48589
diff
changeset
|
1913 */hgmerge-*/f~base */hgmerge-*/f~local.txt */hgmerge-*/f~other.txt */repo/f.txt (glob) |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1914 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1915 (branch merge, don't forget to commit) |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1916 |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1917 Binary files capability checking |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1918 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1919 $ hg update -q -C 0 |
46816
ea8bfd33c22a
tests: replace some `python` by `"$PYTHON"` to not only use Python 2
Martin von Zweigbergk <martinvonz@google.com>
parents:
46417
diff
changeset
|
1920 $ "$PYTHON" <<EOF |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1921 > with open('b', 'wb') as fp: |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1922 > fp.write(b'\x00\x01\x02\x03') |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1923 > EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1924 $ hg add b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1925 $ hg commit -qm "add binary file (#1)" |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1926 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1927 $ hg update -q -C 0 |
46816
ea8bfd33c22a
tests: replace some `python` by `"$PYTHON"` to not only use Python 2
Martin von Zweigbergk <martinvonz@google.com>
parents:
46417
diff
changeset
|
1928 $ "$PYTHON" <<EOF |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1929 > with open('b', 'wb') as fp: |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1930 > fp.write(b'\x03\x02\x01\x00') |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1931 > EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1932 $ hg add b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1933 $ hg commit -qm "add binary file (#2)" |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1934 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1935 By default, binary files capability of internal merge tools is not |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1936 checked strictly. |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1937 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1938 (for merge-patterns, chosen unintentionally) |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1939 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1940 $ hg merge 9 \ |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1941 > --config merge-patterns.b=:merge-other \ |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1942 > --config merge-patterns.re:[a-z]=:other |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1943 warning: check merge-patterns configurations, if ':merge-other' for binary file 'b' is unintentional |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1944 (see 'hg help merge-tools' for binary files capability) |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1945 merging b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1946 warning: b looks like a binary file. |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1947 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1948 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1949 [1] |
43873
8caec25f5d8f
merge: add commands.merge.require-rev to require an argument to hg merge
Kyle Lippincott <spectral@google.com>
parents:
43738
diff
changeset
|
1950 (Testing that commands.merge.require-rev doesn't break --abort) |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1951 $ hg merge --abort -q |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1952 |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1953 (for ui.merge, ignored unintentionally) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1954 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1955 $ hg merge 9 \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1956 > --config merge-tools.:other.binary=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1957 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1958 tool :other (for pattern b) can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1959 tool true can't handle binary |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1960 tool :other can't handle binary |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1961 tool false can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1962 no tool found to merge b |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
1963 file 'b' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
1964 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
40486
diff
changeset
|
1965 What do you want to do? u |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1966 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1967 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1968 [1] |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1969 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1970 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1971 With merge.strict-capability-check=true, binary files capability of |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1972 internal merge tools is checked strictly. |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1973 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1974 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1975 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1976 0000: 03 02 01 00 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1977 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1978 (for merge-patterns) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1979 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1980 $ hg merge 9 --config merge.strict-capability-check=true \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1981 > --config merge-tools.:merge-other.binary=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1982 > --config merge-patterns.b=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1983 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1984 tool :merge-other (for pattern b) can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1985 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1986 (branch merge, don't forget to commit) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1987 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1988 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1989 0000: 00 01 02 03 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1990 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1991 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1992 (for ui.merge) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1993 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1994 $ hg merge 9 --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1995 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1996 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1997 (branch merge, don't forget to commit) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1998 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1999 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2000 0000: 00 01 02 03 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2001 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2002 |
40478
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2003 Check that the extra information is printed correctly |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2004 |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2005 $ hg merge 9 \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2006 > --config merge-tools.testecho.executable='echo' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2007 > --config merge-tools.testecho.args='merge runs here ...' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2008 > --config merge-tools.testecho.binary=True \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2009 > --config ui.merge=testecho \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2010 > --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2011 > --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"' |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2012 merging b |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2013 |
40486
ff37b1712fa5
tests: conditonalize a difference in test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40478
diff
changeset
|
2014 Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !) |
ff37b1712fa5
tests: conditonalize a difference in test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40478
diff
changeset
|
2015 Running merge tool for b (*/bin/echo): (glob) (no-windows !) |
40478
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2016 - local (working copy): 10:2d1f533d add binary file (#2) tip default |
48589
a51c522c0064
merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48587
diff
changeset
|
2017 - base (common ancestor): -1:00000000 default |
40478
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2018 - other (merge rev): 9:1e7ad7d7 add binary file (#1) default |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2019 merge runs here ... |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2020 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2021 (branch merge, don't forget to commit) |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
2022 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2023 Check that debugpicktool examines which merge tool is chosen for |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2024 specified file as expected |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2025 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2026 $ beforemerge |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2027 [merge-tools] |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2028 false.whatever= |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2029 true.priority=1 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2030 true.executable=cat |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
2031 missingbinary.executable=doesnotexist |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2032 # hg update -C 1 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2033 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2034 (default behavior: checking files in the working parent context) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2035 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2036 $ hg manifest |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2037 f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2038 $ hg debugpickmergetool |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2039 f = true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2040 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2041 (-X/-I and file patterns limmit examination targets) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2042 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2043 $ hg debugpickmergetool -X f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2044 $ hg debugpickmergetool unknown |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2045 unknown: no such file in rev ef83787e2614 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2046 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2047 (--changedelete emulates merging change and delete) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2048 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2049 $ hg debugpickmergetool --changedelete |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2050 f = :prompt |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2051 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2052 (-r REV causes checking files in specified revision) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2053 |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
2054 $ hg manifest -r 8 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2055 f.txt |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
2056 $ hg debugpickmergetool -r 8 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2057 f.txt = true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2058 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2059 #if symlink |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2060 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2061 (symlink causes chosing :prompt) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2062 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2063 $ hg debugpickmergetool -r 6d00b3726f6e |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2064 f = :prompt |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2065 |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2066 (by default, it is assumed that no internal merge tools has symlinks |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2067 capability) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2068 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2069 $ hg debugpickmergetool \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2070 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2071 > --config merge-tools.:merge-other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2072 > --config merge-patterns.f=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2073 > --config merge-patterns.re:[f]=:merge-local \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2074 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2075 f = :prompt |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2076 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2077 $ hg debugpickmergetool \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2078 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2079 > --config merge-tools.:other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2080 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2081 f = :prompt |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2082 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2083 (with strict-capability-check=true, actual symlink capabilities are |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2084 checked striclty) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2085 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2086 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2087 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2088 > --config merge-tools.:merge-other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2089 > --config merge-patterns.f=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2090 > --config merge-patterns.re:[f]=:merge-local \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2091 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2092 f = :other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2093 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2094 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2095 > -r 6d00b3726f6e \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2096 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2097 f = :other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2098 |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2099 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2100 > -r 6d00b3726f6e \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2101 > --config merge-tools.:merge-other.symlink=true \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2102 > --config ui.merge=:merge-other |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2103 f = :prompt |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2104 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2105 #endif |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2106 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2107 (--verbose shows some configurations) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2108 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2109 $ hg debugpickmergetool --tool foobar -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2110 with --tool 'foobar' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2111 f = foobar |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2112 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2113 $ HGMERGE=false hg debugpickmergetool -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2114 with HGMERGE='false' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2115 f = false |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2116 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2117 $ hg debugpickmergetool --config ui.merge=false -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2118 with ui.merge='false' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2119 f = false |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2120 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2121 (--debug shows errors detected intermediately) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2122 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2123 $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2124 couldn't find merge tool true (for pattern f) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2125 couldn't find merge tool true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2126 f = false |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
2127 |
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
2128 $ cd .. |