equal
deleted
inserted
replaced
109 |
109 |
110 Interactive merge: |
110 Interactive merge: |
111 |
111 |
112 $ hg co -C |
112 $ hg co -C |
113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
114 1 other heads for branch "default" |
114 |
115 |
115 $ hg merge --config ui.interactive=true <<EOF |
116 $ hg merge --config ui.interactive=true <<EOF |
116 > c |
117 > c |
117 > d |
118 > d |
118 > EOF |
119 > EOF |
169 |
170 |
170 Interactive merge with bad input: |
171 Interactive merge with bad input: |
171 |
172 |
172 $ hg co -C |
173 $ hg co -C |
173 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
174 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
175 1 other heads for branch "default" |
174 |
176 |
175 $ hg merge --config ui.interactive=true <<EOF |
177 $ hg merge --config ui.interactive=true <<EOF |
176 > foo |
178 > foo |
177 > bar |
179 > bar |
178 > d |
180 > d |
241 |
243 |
242 Interactive merge with not enough input: |
244 Interactive merge with not enough input: |
243 |
245 |
244 $ hg co -C |
246 $ hg co -C |
245 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
247 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
248 1 other heads for branch "default" |
246 |
249 |
247 $ hg merge --config ui.interactive=true <<EOF |
250 $ hg merge --config ui.interactive=true <<EOF |
248 > d |
251 > d |
249 > EOF |
252 > EOF |
250 local changed file1 which remote deleted |
253 local changed file1 which remote deleted |
299 |
302 |
300 Choose local versions of files |
303 Choose local versions of files |
301 |
304 |
302 $ hg co -C |
305 $ hg co -C |
303 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
306 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
307 1 other heads for branch "default" |
304 |
308 |
305 $ hg merge --tool :local |
309 $ hg merge --tool :local |
306 0 files updated, 3 files merged, 0 files removed, 0 files unresolved |
310 0 files updated, 3 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) |
311 (branch merge, don't forget to commit) |
308 $ status 2>&1 | tee $TESTTMP/local.status |
312 $ status 2>&1 | tee $TESTTMP/local.status |
343 |
347 |
344 Choose other versions of files |
348 Choose other versions of files |
345 |
349 |
346 $ hg co -C |
350 $ hg co -C |
347 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
352 1 other heads for branch "default" |
348 |
353 |
349 $ hg merge --tool :other |
354 $ hg merge --tool :other |
350 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
355 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
351 (branch merge, don't forget to commit) |
356 (branch merge, don't forget to commit) |
352 $ status 2>&1 | tee $TESTTMP/other.status |
357 $ status 2>&1 | tee $TESTTMP/other.status |
387 |
392 |
388 Fail |
393 Fail |
389 |
394 |
390 $ hg co -C |
395 $ hg co -C |
391 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
396 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
397 1 other heads for branch "default" |
392 |
398 |
393 $ hg merge --tool :fail |
399 $ hg merge --tool :fail |
394 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
400 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
395 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
401 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
396 [1] |
402 [1] |
434 |
440 |
435 Force prompts with no input (should be similar to :fail) |
441 Force prompts with no input (should be similar to :fail) |
436 |
442 |
437 $ hg co -C |
443 $ hg co -C |
438 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
444 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
445 1 other heads for branch "default" |
439 |
446 |
440 $ hg merge --config ui.interactive=True --tool :prompt |
447 $ hg merge --config ui.interactive=True --tool :prompt |
441 local changed file1 which remote deleted |
448 local changed file1 which remote deleted |
442 use (c)hanged version, (d)elete, or leave (u)nresolved? |
449 use (c)hanged version, (d)elete, or leave (u)nresolved? |
443 remote changed file2 which local deleted |
450 remote changed file2 which local deleted |
489 |
496 |
490 Force prompts |
497 Force prompts |
491 |
498 |
492 $ hg co -C |
499 $ hg co -C |
493 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
500 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
501 1 other heads for branch "default" |
494 |
502 |
495 $ hg merge --tool :prompt |
503 $ hg merge --tool :prompt |
496 local changed file1 which remote deleted |
504 local changed file1 which remote deleted |
497 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
505 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
498 remote changed file2 which local deleted |
506 remote changed file2 which local deleted |
542 |
550 |
543 Choose to merge all files |
551 Choose to merge all files |
544 |
552 |
545 $ hg co -C |
553 $ hg co -C |
546 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
554 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
555 1 other heads for branch "default" |
547 |
556 |
548 $ hg merge --tool :merge3 |
557 $ hg merge --tool :merge3 |
549 local changed file1 which remote deleted |
558 local changed file1 which remote deleted |
550 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
559 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
551 remote changed file2 which local deleted |
560 remote changed file2 which local deleted |