Mercurial > hg
annotate tests/test-merge-tools.t @ 25476:46727fea7a00
tests: simplify calls to dummyssh
dummyssh is marked executable and is in the path, no need for python,
TESTDIR, or quotes.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2015 15:02:49 -0500 |
parents | 21b33f0460e0 |
children | fe03f522dda9 |
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 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
4 $ hg init |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
5 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
6 revision 0 |
7731 | 7 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
8 $ echo "revision 0" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
9 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
10 $ hg commit -Am "revision 0" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
11 adding f |
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 1 |
7731 | 14 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
15 $ echo "revision 1" > 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 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
18 $ hg update 0 > /dev/null |
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 2 |
7731 | 21 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
22 $ echo "revision 2" > 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 2" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
25 created new head |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
26 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
27 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
28 revision 3 - simple to merge |
7731 | 29 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
30 $ echo "revision 3" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
31 $ hg commit -Am "revision 3" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
32 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
|
33 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
34 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
|
35 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
36 $ 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
|
37 $ 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
|
38 $ 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
|
39 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
|
40 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
41 $ 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
|
42 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
43 $ beforemerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
44 > cat .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
45 > echo "# hg update -C 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
46 > hg update -C 1 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
47 > } |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
48 $ aftermerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
49 > echo "# cat f" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
50 > cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
51 > echo "# hg stat" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
52 > hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
53 > rm -f f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
54 > } |
7731 | 55 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
56 Tool selection |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
58 default is internal merge: |
7731 | 59 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
60 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
61 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
62 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
63 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
64 hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
65 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
|
66 running from a devel copy, not a temp installation |
7731 | 67 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
68 $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
69 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
70 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15264
diff
changeset
|
71 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
73 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
74 [1] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
75 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
76 # cat f |
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21552
diff
changeset
|
77 <<<<<<< local: ef83787e2614 - test: revision 1 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
78 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
79 ======= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
80 revision 2 |
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21552
diff
changeset
|
81 >>>>>>> other: 0185f4e0cf02 - test: revision 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
82 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
83 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
84 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
85 ? f.orig |
7731 | 86 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
87 simplest hgrc using false for merge: |
7731 | 88 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
89 $ echo "false.whatever=" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
90 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
91 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
92 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
93 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
94 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
95 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
96 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
97 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
98 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
99 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
100 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
101 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
102 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
103 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
104 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
105 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
106 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
107 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
108 #if unix-permissions |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
109 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
110 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
|
111 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
112 $ echo "echo fail" > false |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
113 $ hg up -qC 1 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
114 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
115 merging f |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
116 warning: conflicts during merge. |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
117 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
120 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
121 $ rm false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
122 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
123 #endif |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
124 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
125 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
|
126 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
127 $ mkdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
128 $ hg up -qC 1 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
129 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
130 merging f |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
131 warning: conflicts during merge. |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
132 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
133 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
134 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
135 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
136 $ rmdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
137 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
138 true with higher .priority gets precedence: |
7731 | 139 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
140 $ echo "true.priority=1" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
141 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
142 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
143 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
144 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
145 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
146 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
147 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
148 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
|
149 (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
|
150 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
151 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
152 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
153 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
154 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
155 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
156 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
157 unless lowered on command line: |
7731 | 158 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
159 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
160 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
161 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
162 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
163 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
164 $ 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
|
165 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
166 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
167 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
168 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
169 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
170 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
171 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
172 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
173 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
174 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
175 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
176 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
177 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
178 or false set higher on command line: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
179 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
180 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
181 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
182 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
183 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
184 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
185 $ 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
|
186 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
187 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
188 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
189 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
190 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
191 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
192 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
193 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
194 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
195 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
196 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
197 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
198 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
199 or true.executable not found in PATH: |
7731 | 200 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
201 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
202 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
203 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
204 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
205 # hg update -C 1 |
17492 | 206 $ 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
|
207 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
208 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
209 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
210 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
211 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
212 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
213 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
214 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
215 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
216 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
217 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
218 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
219 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
220 or true.executable with bogus path: |
7731 | 221 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
222 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
223 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
224 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
225 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
226 # hg update -C 1 |
17492 | 227 $ 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
|
228 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
229 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
230 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
231 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
232 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
233 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
234 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
235 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
236 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
237 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
238 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
239 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
240 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
241 but true.executable set to cat found in PATH works: |
7731 | 242 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
243 $ echo "true.executable=cat" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
244 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
245 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
246 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
247 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
248 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
249 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
250 $ hg merge -r 2 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
251 merging f |
12460
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 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
255 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
256 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
257 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
258 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
|
259 (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
|
260 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
261 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
262 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
263 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
264 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
265 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
266 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
267 and true.executable set to cat with path works: |
7731 | 268 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
269 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
270 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
271 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
272 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
273 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
274 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
275 $ 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
|
276 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
277 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
278 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
279 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
280 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
281 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
282 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
283 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
|
284 (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
|
285 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
286 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
287 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
288 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
289 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
290 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
291 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
292 #if unix-permissions |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
293 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
294 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
|
295 |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
296 $ 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
|
297 $ beforemerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
298 [merge-tools] |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
299 false.whatever= |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
300 true.priority=1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
301 true.executable=cat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
302 # hg update -C 1 |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
303 $ hg --config merge-tools.true.executable='sh' \ |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
304 > --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
|
305 > merge -r 2 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
306 merging f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
307 custom merge tool |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
308 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
|
309 (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
|
310 $ aftermerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
311 # cat f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
312 revision 1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
313 space |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
314 # hg stat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
315 M f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
316 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
317 #endif |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
318 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
319 Tool selection and merge-patterns |
7731 | 320 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
321 merge-patterns specifies new tool false: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
322 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
323 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
324 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
325 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
326 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
327 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
328 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
329 $ 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
|
330 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
331 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
332 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
333 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
334 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
335 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
336 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
337 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
338 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
339 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
340 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
341 ? f.orig |
7731 | 342 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
343 merge-patterns specifies executable not found in PATH and gets warning: |
7731 | 344 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
345 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
346 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
347 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
348 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
349 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
350 # hg update -C 1 |
17492 | 351 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
352 couldn't find merge tool true specified for f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
353 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
354 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
355 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
356 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
357 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
358 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
359 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
360 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
361 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
362 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
363 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
364 ? f.orig |
7731 | 365 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
366 merge-patterns specifies executable with bogus path and gets warning: |
7731 | 367 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
368 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
369 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
370 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
371 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
372 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
373 # hg update -C 1 |
17492 | 374 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
375 couldn't find merge tool true specified for f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
376 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
377 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
378 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
379 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
380 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
381 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
382 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
383 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
384 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
385 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
386 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
387 ? f.orig |
7731 | 388 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
389 ui.merge overrules priority |
7731 | 390 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
391 ui.merge specifies false: |
7731 | 392 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
393 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
394 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
395 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
396 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
397 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
398 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
399 $ hg merge -r 2 --config ui.merge=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
400 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
401 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
402 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
403 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
404 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
405 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
406 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
407 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
408 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
409 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
410 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
411 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
412 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
413 ui.merge specifies internal:fail: |
7731 | 414 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
415 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
416 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
417 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
418 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
419 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
420 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
421 $ 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
|
422 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
423 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
424 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
425 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
426 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
427 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
428 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
429 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
430 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
431 |
22706
ad25986c4cd3
filemerge: introduce :x as short version of internal:x merge tool name
Mads Kiilerich <madski@unity3d.com>
parents:
22032
diff
changeset
|
432 ui.merge specifies :local (without internal prefix): |
7731 | 433 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
434 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
435 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
436 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
437 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
438 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
439 # 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
|
440 $ hg merge -r 2 --config ui.merge=:local |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
441 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
|
442 (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
|
443 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
444 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
445 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
446 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
447 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
448 M f |
7731 | 449 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
450 ui.merge specifies internal:other: |
7731 | 451 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
452 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
453 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
454 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
455 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
456 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
457 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
458 $ 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
|
459 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
|
460 (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
|
461 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
462 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
463 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
464 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
465 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
466 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
467 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
468 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
|
469 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
470 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
471 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
472 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
473 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
474 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
475 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
476 $ hg merge -r 2 --config ui.merge=internal:prompt |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
477 no tool found to merge f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
478 keep (l)ocal or take (o)ther? l |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
479 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
|
480 (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
|
481 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
482 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
483 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
484 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
485 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
486 M f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
487 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
488 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
|
489 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
490 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
491 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
492 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
493 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
494 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
495 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
496 $ 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
|
497 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
498 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
499 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
500 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
501 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
502 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
503 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
504 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
505 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
506 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
507 ? f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
508 ? f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
509 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
510 ? f.other |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
511 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
512 f.base: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
513 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
514 $ cat f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
515 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
516 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
517 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
518 f.local: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
519 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
520 $ cat f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
521 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
522 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
523 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
524 f.other: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
525 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
526 $ cat f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
527 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
528 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
529 $ rm f.base f.local f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
530 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
531 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
|
532 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
533 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
534 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
535 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
536 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
537 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
538 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
539 $ 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
|
540 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
541 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
542 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
543 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
544 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
545 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
546 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
547 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
548 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
549 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
550 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
551 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
552 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
553 Premerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
554 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
555 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
|
556 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
557 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
558 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
559 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
560 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
561 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
562 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
563 $ 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
|
564 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
565 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
566 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
567 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
568 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
569 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
570 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
571 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
572 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
573 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
574 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
575 ? f.orig |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
576 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
577 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
|
578 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
579 $ HGMERGE=internal:other ; export HGMERGE |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
580 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
581 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
582 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
583 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
584 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
585 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
586 $ 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
|
587 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
588 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
589 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
590 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
591 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
592 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
593 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
594 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
595 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
596 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
597 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
598 ? f.orig |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
599 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
600 $ 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
|
601 |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
602 update is a merge ... |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
603 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
604 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
605 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
606 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
607 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
608 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
609 # 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
|
610 $ 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
|
611 $ 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
|
612 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
|
613 $ 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
|
614 $ hg status f |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
615 $ hg revert -q -r 1 . |
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
|
616 $ 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
|
617 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
|
618 $ 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
|
619 $ 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
|
620 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
621 $ hg update -r 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
622 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
623 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
624 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
625 revision 0 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
626 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
627 revision 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
628 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
629 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
|
630 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
631 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
632 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
633 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
634 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
635 M f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
636 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
637 update should also have --tool |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
638 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
639 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
640 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
641 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
642 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
643 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
644 # 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
|
645 $ 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
|
646 $ 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
|
647 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
|
648 $ 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
|
649 $ hg status f |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
650 $ hg revert -q -r 1 . |
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
|
651 $ 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
|
652 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
|
653 $ 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
|
654 $ 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
|
655 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
656 $ hg update -r 2 --tool false |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
657 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
658 merging f failed! |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
659 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
|
660 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
|
661 [1] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
662 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
663 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
664 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
665 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
666 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
667 M f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
668 ? f.orig |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
669 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
670 Default is silent simplemerge: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
671 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
672 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
673 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
674 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
675 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
676 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
677 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
678 $ hg merge -r 3 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
679 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
680 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
|
681 (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
|
682 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
683 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
684 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
685 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
686 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
687 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
688 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
689 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
690 .premerge=True is same: |
7731 | 691 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
692 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
693 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
694 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
695 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
696 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
697 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
698 $ 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
|
699 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
700 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
|
701 (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
|
702 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
703 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
704 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
705 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
706 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
707 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
708 M f |
7731 | 709 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
710 .premerge=False executes merge-tool: |
7731 | 711 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
712 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
713 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
714 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
715 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
716 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
717 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
718 $ 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
|
719 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
720 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
721 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
722 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
723 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
724 revision 0 |
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 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
727 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
|
728 (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
|
729 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
730 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
731 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
732 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
733 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
734 M f |
7731 | 735 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
736 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
|
737 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
738 $ beforemerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
739 [merge-tools] |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
740 false.whatever= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
741 true.priority=1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
742 true.executable=cat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
743 # hg update -C 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
744 $ 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
|
745 merging f |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
746 <<<<<<< local: ef83787e2614 - test: revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
747 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
748 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
749 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
750 revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
751 >>>>>>> other: 81448d39c9a0 - test: revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
752 revision 0 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
753 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
754 revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
755 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
|
756 (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
|
757 $ aftermerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
758 # cat f |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
759 <<<<<<< local: ef83787e2614 - test: revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
760 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
761 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
762 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
763 revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
764 >>>>>>> other: 81448d39c9a0 - test: revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
765 # hg stat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
766 M f |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
767 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
768 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
|
769 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
770 $ beforemerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
771 [merge-tools] |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
772 false.whatever= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
773 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
|
774 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
|
775 # 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
|
776 $ 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
|
777 merging f |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
778 <<<<<<< local: ef83787e2614 - test: revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
779 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
780 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
781 ||||||| base |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
782 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
783 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
784 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
785 revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
786 >>>>>>> other: 81448d39c9a0 - test: revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
787 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
788 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
789 revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
790 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
|
791 (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
|
792 $ aftermerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
793 # cat f |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
794 <<<<<<< local: ef83787e2614 - test: revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
795 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
796 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
797 ||||||| base |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
798 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
799 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
800 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
801 revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
802 >>>>>>> other: 81448d39c9a0 - test: revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
803 # hg stat |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
804 M f |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
805 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
806 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
807 Tool execution |
7731 | 808 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
809 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
|
810 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
811 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
812 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
813 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
814 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
815 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
816 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
817 $ 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
|
818 > | sed 's,==> .* <==,==> ... <==,g' |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
819 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
820 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
821 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
822 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
823 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
824 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
825 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
826 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
827 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
828 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
829 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
830 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
831 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
832 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
833 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
834 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
835 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
|
836 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
837 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
838 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
839 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
840 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
841 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
842 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
843 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
844 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
|
845 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
846 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
847 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
848 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
849 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
850 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
851 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
852 $ 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
|
853 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
854 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
|
855 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
856 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
857 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
858 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
859 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
860 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
861 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
862 - 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
|
863 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
864 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
865 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
866 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
867 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
868 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
869 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
870 $ 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
|
871 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
872 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
|
873 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
874 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
875 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
876 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
877 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
878 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
879 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
880 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
|
881 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
882 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
883 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
884 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
885 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
886 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
887 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
888 $ 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
|
889 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
890 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
|
891 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
892 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
893 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
894 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
895 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
896 M f |
7731 | 897 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
898 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
|
899 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
900 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
901 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
902 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
903 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
904 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
905 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
906 $ cat <<EOF > 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
907 > cat "\$1" "\$2" "\$3" > "\$4" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
908 > EOF |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
909 $ hg --config merge-tools.true.executable='sh' \ |
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
910 > --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
|
911 > merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
912 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
913 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
|
914 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
915 $ rm -f 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
916 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
917 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
918 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
919 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
920 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
921 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
922 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
923 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
924 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
925 M f |
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
926 |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
927 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
|
928 (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
|
929 for Unix-like permission) |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
930 |
17902
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
931 #if unix-permissions |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
932 $ beforemerge |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
933 [merge-tools] |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
934 false.whatever= |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
935 true.priority=1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
936 true.executable=cat |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
937 # hg update -C 1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
938 $ 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
|
939 $ hg commit -Am "revision 5" |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
940 adding "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
941 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
|
942 $ 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
|
943 $ 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
|
944 $ 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
|
945 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
|
946 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
|
947 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
|
948 $ 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
|
949 merging "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
950 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
|
951 (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
|
952 $ hg update -C 1 > /dev/null |
17901
a19046744e4e
filemerge: only run test for issue3581 on non-windows environments
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17885
diff
changeset
|
953 #endif |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
954 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
955 Merge post-processing |
7731 | 956 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
957 cat is a bad merge-tool and doesn't change: |
7731 | 958 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
959 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
960 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
961 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
962 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
963 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
964 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
965 $ 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
|
966 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
967 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
968 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
969 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
970 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
971 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
972 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
973 output file f appears unchanged |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
974 was merge successful (yn)? n |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
975 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
976 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
977 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
978 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
979 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
980 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
981 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
982 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
983 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
984 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
985 ? f.orig |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
986 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
987 #if symlink |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
988 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
989 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
|
990 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
991 $ hg update -q -C 1 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
992 $ rm f |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
993 $ ln -s symlink f |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
994 $ hg commit -qm 'f is symlink' |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
995 $ 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
|
996 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
|
997 warning: internal :merge cannot merge symlinks for f |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
998 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
999 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1000 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1001 [1] |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1002 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1003 #endif |