Mercurial > hg
comparison tests/test-merge-tools.t @ 26611:a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
This means that in ms.resolve we must call merge after calling premerge. This
doesn't yet mean that all premerges happen before any merges -- however, this
does get us closer to our goal.
The output differences are because we recompute the merge tool. The only
user-visible difference caused by this patch is that if the tool is missing
we'll print the warning twice. Not a huge deal, though.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 20:47:14 -0700 |
| parents | b907051df5b7 |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 26610:f9f82c444ff7 | 26611:a5ff66e6d77a |
|---|---|
| 349 true.executable=cat | 349 true.executable=cat |
| 350 # hg update -C 1 | 350 # hg update -C 1 |
| 351 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool | 351 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
| 352 couldn't find merge tool true specified for f | 352 couldn't find merge tool true specified for f |
| 353 merging f | 353 merging f |
| 354 couldn't find merge tool true specified for f | |
| 354 merging f failed! | 355 merging f failed! |
| 355 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 356 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 356 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 357 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 357 [1] | 358 [1] |
| 358 $ aftermerge | 359 $ aftermerge |
| 372 true.executable=cat | 373 true.executable=cat |
| 373 # hg update -C 1 | 374 # hg update -C 1 |
| 374 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool | 375 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
| 375 couldn't find merge tool true specified for f | 376 couldn't find merge tool true specified for f |
| 376 merging f | 377 merging f |
| 378 couldn't find merge tool true specified for f | |
| 377 merging f failed! | 379 merging f failed! |
| 378 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 380 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 379 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 381 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 380 [1] | 382 [1] |
| 381 $ aftermerge | 383 $ aftermerge |