Mercurial > hg
annotate tests/test-merge-tools.out @ 8703:8676dd819444
transplant: use match object rather than files for commit
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 01 Jun 2009 13:51:21 -0500 |
parents | 9a4fe59b1eca |
children | 94319ae527cf |
rev | line source |
---|---|
7731 | 1 # revision 0 |
2 adding f | |
3 # revision 1 | |
4 # revision 2 | |
5 created new head | |
6 # revision 3 - simple to merge | |
7 created new head | |
8 | |
9 | |
10 Tool selection | |
11 | |
12 # default is internal merge: | |
13 [merge-tools] | |
14 # hg update -C 1 | |
15 # hg merge -r 2 | |
16 merging f | |
17 warning: conflicts during merge. | |
18 merging f failed! | |
19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
20 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 21 # cat f |
22 <<<<<<< local | |
23 revision 1 | |
24 ======= | |
25 revision 2 | |
26 >>>>>>> other | |
27 space | |
28 # hg stat | |
29 M f | |
30 ? f.orig | |
31 | |
32 # simplest hgrc using false for merge: | |
33 [merge-tools] | |
34 false.whatever= | |
35 # hg update -C 1 | |
36 # hg merge -r 2 | |
37 merging f | |
38 merging f failed! | |
39 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
40 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 41 # cat f |
42 revision 1 | |
43 space | |
44 # hg stat | |
45 M f | |
46 ? f.orig | |
47 | |
48 # true with higher .priority gets precedence: | |
49 [merge-tools] | |
50 false.whatever= | |
51 true.priority=1 | |
52 # hg update -C 1 | |
53 # hg merge -r 2 | |
54 merging f | |
55 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
56 (branch merge, don't forget to commit) | |
57 # cat f | |
58 revision 1 | |
59 space | |
60 # hg stat | |
61 M f | |
62 | |
63 # unless lowered on command line: | |
64 [merge-tools] | |
65 false.whatever= | |
66 true.priority=1 | |
67 # hg update -C 1 | |
68 # hg merge -r 2 --config merge-tools.true.priority=-7 | |
69 merging f | |
70 merging f failed! | |
71 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
72 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 73 # cat f |
74 revision 1 | |
75 space | |
76 # hg stat | |
77 M f | |
78 ? f.orig | |
79 | |
80 # or false set higher on command line: | |
81 [merge-tools] | |
82 false.whatever= | |
83 true.priority=1 | |
84 # hg update -C 1 | |
85 # hg merge -r 2 --config merge-tools.false.priority=117 | |
86 merging f | |
87 merging f failed! | |
88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
89 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 90 # cat f |
91 revision 1 | |
92 space | |
93 # hg stat | |
94 M f | |
95 ? f.orig | |
96 | |
97 # or true.executable not found in PATH: | |
98 [merge-tools] | |
99 false.whatever= | |
100 true.priority=1 | |
101 # hg update -C 1 | |
102 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool | |
103 merging f | |
104 merging f failed! | |
105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
106 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 107 # cat f |
108 revision 1 | |
109 space | |
110 # hg stat | |
111 M f | |
112 ? f.orig | |
113 | |
114 # or true.executable with bogus path: | |
115 [merge-tools] | |
116 false.whatever= | |
117 true.priority=1 | |
118 # hg update -C 1 | |
119 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool | |
120 merging f | |
121 merging f failed! | |
122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
123 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 124 # cat f |
125 revision 1 | |
126 space | |
127 # hg stat | |
128 M f | |
129 ? f.orig | |
130 | |
131 # but true.executable set to cat found in PATH works: | |
132 [merge-tools] | |
133 false.whatever= | |
134 true.priority=1 | |
135 true.executable=cat | |
136 # hg update -C 1 | |
137 # hg merge -r 2 | |
138 revision 1 | |
139 space | |
140 revision 0 | |
141 space | |
142 revision 2 | |
143 space | |
144 merging f | |
145 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
146 (branch merge, don't forget to commit) | |
147 # cat f | |
148 revision 1 | |
149 space | |
150 # hg stat | |
151 M f | |
152 | |
153 # and true.executable set to cat with path works: | |
154 [merge-tools] | |
155 false.whatever= | |
156 true.priority=1 | |
157 true.executable=cat | |
158 # hg update -C 1 | |
8539
9a4fe59b1eca
test-merge-tools: windows fixes
Patrick Mezard <pmezard@gmail.com>
parents:
7859
diff
changeset
|
159 # hg merge -r 2 --config merge-tools.true.executable=cat |
7731 | 160 revision 1 |
161 space | |
162 revision 0 | |
163 space | |
164 revision 2 | |
165 space | |
166 merging f | |
167 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
168 (branch merge, don't forget to commit) | |
169 # cat f | |
170 revision 1 | |
171 space | |
172 # hg stat | |
173 M f | |
174 | |
175 | |
176 Tool selection and merge-patterns | |
177 | |
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
178 # merge-patterns specifies new tool false: |
7731 | 179 [merge-tools] |
180 false.whatever= | |
181 true.priority=1 | |
182 true.executable=cat | |
183 # hg update -C 1 | |
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
184 # hg merge -r 2 --config merge-patterns.f=false |
7731 | 185 merging f |
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
186 merging f failed! |
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
187 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
188 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 189 # cat f |
190 revision 1 | |
191 space | |
192 # hg stat | |
193 M f | |
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
194 ? f.orig |
7731 | 195 |
196 # merge-patterns specifies executable not found in PATH and gets warning: | |
197 [merge-tools] | |
198 false.whatever= | |
199 true.priority=1 | |
200 true.executable=cat | |
201 # hg update -C 1 | |
202 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | |
203 couldn't find merge tool true specified for f | |
204 merging f | |
205 merging f failed! | |
206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
207 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 208 # cat f |
209 revision 1 | |
210 space | |
211 # hg stat | |
212 M f | |
213 ? f.orig | |
214 | |
215 # merge-patterns specifies executable with bogus path and gets warning: | |
216 [merge-tools] | |
217 false.whatever= | |
218 true.priority=1 | |
219 true.executable=cat | |
220 # hg update -C 1 | |
221 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | |
7732
3793802ea41b
Make util.find_exe alway returns existing file, fixing issue1459
Mads Kiilerich <mads@kiilerich.com>
parents:
7731
diff
changeset
|
222 couldn't find merge tool true specified for f |
7731 | 223 merging f |
224 merging f failed! | |
225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
226 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 227 # cat f |
228 revision 1 | |
229 space | |
230 # hg stat | |
231 M f | |
232 ? f.orig | |
233 | |
234 | |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
235 ui.merge overrules priority |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
236 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
237 # ui.merge specifies false: |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
238 [merge-tools] |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
239 false.whatever= |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
240 true.priority=1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
241 true.executable=cat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
242 # hg update -C 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
243 # hg merge -r 2 --config ui.merge=false |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
244 merging f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
245 merging f failed! |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
246 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7859
e945e012d5d1
Fix for merge changes introduced in rev 9fe7e6acf525
Lee Cantey <lcantey@gmail.com>
parents:
7846
diff
changeset
|
247 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
248 # cat f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
249 revision 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
250 space |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
251 # hg stat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
252 M f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
253 ? f.orig |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
254 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
255 # ui.merge specifies internal:fail: |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
256 [merge-tools] |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
257 false.whatever= |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
258 true.priority=1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
259 true.executable=cat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
260 # hg update -C 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
261 # hg merge -r 2 --config ui.merge=internal:fail |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
262 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7859
e945e012d5d1
Fix for merge changes introduced in rev 9fe7e6acf525
Lee Cantey <lcantey@gmail.com>
parents:
7846
diff
changeset
|
263 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
264 # cat f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
265 revision 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
266 space |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
267 # hg stat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
268 M f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
269 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
270 # ui.merge specifies internal:local: |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
271 [merge-tools] |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
272 false.whatever= |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
273 true.priority=1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
274 true.executable=cat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
275 # hg update -C 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
276 # hg merge -r 2 --config ui.merge=internal:local |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
277 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
278 (branch merge, don't forget to commit) |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
279 # cat f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
280 revision 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
281 space |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
282 # hg stat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
283 M f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
284 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
285 # ui.merge specifies internal:other: |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
286 [merge-tools] |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
287 false.whatever= |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
288 true.priority=1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
289 true.executable=cat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
290 # hg update -C 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
291 # hg merge -r 2 --config ui.merge=internal:other |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
292 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
293 (branch merge, don't forget to commit) |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
294 # cat f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
295 revision 2 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
296 space |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
297 # hg stat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
298 M f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
299 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
300 # ui.merge specifies internal:other but is overruled by pattern for false: |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
301 [merge-tools] |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
302 false.whatever= |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
303 true.priority=1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
304 true.executable=cat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
305 # hg update -C 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
306 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
307 merging f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
308 merging f failed! |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
309 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7859
e945e012d5d1
Fix for merge changes introduced in rev 9fe7e6acf525
Lee Cantey <lcantey@gmail.com>
parents:
7846
diff
changeset
|
310 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
311 # cat f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
312 revision 1 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
313 space |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
314 # hg stat |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
315 M f |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
316 ? f.orig |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
317 |
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
318 |
7731 | 319 Premerge |
320 | |
321 # Default is silent simplemerge: | |
322 [merge-tools] | |
323 false.whatever= | |
324 true.priority=1 | |
325 true.executable=cat | |
326 # hg update -C 1 | |
327 # hg merge -r 3 | |
328 merging f | |
329 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
330 (branch merge, don't forget to commit) | |
331 # cat f | |
332 revision 1 | |
333 space | |
334 revision 3 | |
335 # hg stat | |
336 M f | |
337 | |
338 # .premerge=True is same: | |
339 [merge-tools] | |
340 false.whatever= | |
341 true.priority=1 | |
342 true.executable=cat | |
343 # hg update -C 1 | |
344 # hg merge -r 3 --config merge-tools.true.premerge=True | |
345 merging f | |
346 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
347 (branch merge, don't forget to commit) | |
348 # cat f | |
349 revision 1 | |
350 space | |
351 revision 3 | |
352 # hg stat | |
353 M f | |
354 | |
355 # .premerge=False executes merge-tool: | |
356 [merge-tools] | |
357 false.whatever= | |
358 true.priority=1 | |
359 true.executable=cat | |
360 # hg update -C 1 | |
361 # hg merge -r 3 --config merge-tools.true.premerge=False | |
362 revision 1 | |
363 space | |
364 revision 0 | |
365 space | |
366 revision 0 | |
367 space | |
368 revision 3 | |
369 merging f | |
370 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
371 (branch merge, don't forget to commit) | |
372 # cat f | |
373 revision 1 | |
374 space | |
375 # hg stat | |
376 M f | |
377 | |
378 | |
379 Tool execution | |
380 | |
381 # set tools.args explicit to include $base $local $other $output: | |
382 [merge-tools] | |
383 false.whatever= | |
384 true.priority=1 | |
385 true.executable=cat | |
386 # hg update -C 1 | |
387 ==> ... <== | |
388 revision 0 | |
389 space | |
390 | |
391 ==> ... <== | |
392 revision 1 | |
393 space | |
394 | |
395 ==> ... <== | |
396 revision 2 | |
397 space | |
398 | |
399 ==> ... <== | |
400 revision 1 | |
401 space | |
402 merging f | |
403 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
404 (branch merge, don't forget to commit) | |
405 # cat f | |
406 revision 1 | |
407 space | |
408 # hg stat | |
409 M f | |
410 | |
411 # Merge with "echo mergeresult > $local": | |
412 [merge-tools] | |
413 false.whatever= | |
414 true.priority=1 | |
415 true.executable=cat | |
416 # hg update -C 1 | |
417 merging f | |
418 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
419 (branch merge, don't forget to commit) | |
420 # cat f | |
421 mergeresult | |
422 # hg stat | |
423 M f | |
424 | |
425 # - and $local is the file f: | |
426 [merge-tools] | |
427 false.whatever= | |
428 true.priority=1 | |
429 true.executable=cat | |
430 # hg update -C 1 | |
431 merging f | |
432 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
433 (branch merge, don't forget to commit) | |
434 # cat f | |
435 mergeresult | |
436 # hg stat | |
437 M f | |
438 | |
439 # Merge with "echo mergeresult > $output" - the variable is a bit magic: | |
440 [merge-tools] | |
441 false.whatever= | |
442 true.priority=1 | |
443 true.executable=cat | |
444 # hg update -C 1 | |
445 merging f | |
446 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
447 (branch merge, don't forget to commit) | |
448 # cat f | |
449 mergeresult | |
450 # hg stat | |
451 M f | |
452 | |
453 | |
454 Merge post-processing | |
455 | |
456 # cat is a bad merge-tool and doesn't change: | |
457 [merge-tools] | |
458 false.whatever= | |
459 true.priority=1 | |
460 true.executable=cat | |
461 # hg update -C 1 | |
8539
9a4fe59b1eca
test-merge-tools: windows fixes
Patrick Mezard <pmezard@gmail.com>
parents:
7859
diff
changeset
|
462 # hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
7731 | 463 revision 1 |
464 space | |
465 revision 0 | |
466 space | |
467 revision 2 | |
468 space | |
469 merging f | |
470 merging f failed! | |
471 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7769
diff
changeset
|
472 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7731 | 473 # cat f |
474 revision 1 | |
475 space | |
476 # hg stat | |
477 M f | |
478 ? f.orig | |
479 |