Show More
@@ -104,6 +104,24 b' domerge -r 2 --config merge-patterns.f=t' | |||||
104 | echo "# merge-patterns specifies executable with bogus path and gets warning:" |
|
104 | echo "# merge-patterns specifies executable with bogus path and gets warning:" | |
105 | domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool |
|
105 | domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | |
106 |
|
106 | |||
|
107 | echo | |||
|
108 | echo ui.merge overrules priority | |||
|
109 | echo | |||
|
110 | ||||
|
111 | echo "# ui.merge specifies false:" | |||
|
112 | domerge -r 2 --config ui.merge=false | |||
|
113 | ||||
|
114 | echo "# ui.merge specifies internal:fail:" | |||
|
115 | domerge -r 2 --config ui.merge=internal:fail | |||
|
116 | ||||
|
117 | echo "# ui.merge specifies internal:local:" | |||
|
118 | domerge -r 2 --config ui.merge=internal:local | |||
|
119 | ||||
|
120 | echo "# ui.merge specifies internal:other:" | |||
|
121 | domerge -r 2 --config ui.merge=internal:other | |||
|
122 | ||||
|
123 | echo "# ui.merge specifies internal:other but is overruled by pattern for false:" | |||
|
124 | domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false | |||
107 |
|
125 | |||
108 | echo |
|
126 | echo | |
109 | echo Premerge |
|
127 | echo Premerge |
@@ -232,6 +232,90 b' M f' | |||||
232 | ? f.orig |
|
232 | ? f.orig | |
233 |
|
233 | |||
234 |
|
234 | |||
|
235 | ui.merge overrules priority | |||
|
236 | ||||
|
237 | # ui.merge specifies false: | |||
|
238 | [merge-tools] | |||
|
239 | false.whatever= | |||
|
240 | true.priority=1 | |||
|
241 | true.executable=cat | |||
|
242 | # hg update -C 1 | |||
|
243 | # hg merge -r 2 --config ui.merge=false | |||
|
244 | merging f | |||
|
245 | merging f failed! | |||
|
246 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
247 | use 'hg resolve' to retry unresolved file merges | |||
|
248 | # cat f | |||
|
249 | revision 1 | |||
|
250 | space | |||
|
251 | # hg stat | |||
|
252 | M f | |||
|
253 | ? f.orig | |||
|
254 | ||||
|
255 | # ui.merge specifies internal:fail: | |||
|
256 | [merge-tools] | |||
|
257 | false.whatever= | |||
|
258 | true.priority=1 | |||
|
259 | true.executable=cat | |||
|
260 | # hg update -C 1 | |||
|
261 | # hg merge -r 2 --config ui.merge=internal:fail | |||
|
262 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
263 | use 'hg resolve' to retry unresolved file merges | |||
|
264 | # cat f | |||
|
265 | revision 1 | |||
|
266 | space | |||
|
267 | # hg stat | |||
|
268 | M f | |||
|
269 | ||||
|
270 | # ui.merge specifies internal:local: | |||
|
271 | [merge-tools] | |||
|
272 | false.whatever= | |||
|
273 | true.priority=1 | |||
|
274 | true.executable=cat | |||
|
275 | # hg update -C 1 | |||
|
276 | # hg merge -r 2 --config ui.merge=internal:local | |||
|
277 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
278 | (branch merge, don't forget to commit) | |||
|
279 | # cat f | |||
|
280 | revision 1 | |||
|
281 | space | |||
|
282 | # hg stat | |||
|
283 | M f | |||
|
284 | ||||
|
285 | # ui.merge specifies internal:other: | |||
|
286 | [merge-tools] | |||
|
287 | false.whatever= | |||
|
288 | true.priority=1 | |||
|
289 | true.executable=cat | |||
|
290 | # hg update -C 1 | |||
|
291 | # hg merge -r 2 --config ui.merge=internal:other | |||
|
292 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
293 | (branch merge, don't forget to commit) | |||
|
294 | # cat f | |||
|
295 | revision 2 | |||
|
296 | space | |||
|
297 | # hg stat | |||
|
298 | M f | |||
|
299 | ||||
|
300 | # ui.merge specifies internal:other but is overruled by pattern for false: | |||
|
301 | [merge-tools] | |||
|
302 | false.whatever= | |||
|
303 | true.priority=1 | |||
|
304 | true.executable=cat | |||
|
305 | # hg update -C 1 | |||
|
306 | # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false | |||
|
307 | merging f | |||
|
308 | merging f failed! | |||
|
309 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
310 | use 'hg resolve' to retry unresolved file merges | |||
|
311 | # cat f | |||
|
312 | revision 1 | |||
|
313 | space | |||
|
314 | # hg stat | |||
|
315 | M f | |||
|
316 | ? f.orig | |||
|
317 | ||||
|
318 | ||||
235 | Premerge |
|
319 | Premerge | |
236 |
|
320 | |||
237 | # Default is silent simplemerge: |
|
321 | # Default is silent simplemerge: |
General Comments 0
You need to be logged in to leave comments.
Login now