Mercurial > hg

comparison tests/test-merge-tools.t @ 32254:177742666abd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: make warning message more i18n friendly Before this patch, " specified for " part of warning messages (e.g. "couldn't find merge tool TOOL specified for PAT") isn't translatable.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 13 May 2017 03:28:36 +0900
parents 7d4ce4b567c5
children 7e35d31b41fd
comparison
equal deleted inserted replaced
32253:7d4ce4b567c5 32254:177742666abd
390 false.whatever= 390 false.whatever=
391 true.priority=1 391 true.priority=1
392 true.executable=cat 392 true.executable=cat
393 # hg update -C 1 393 # hg update -C 1
394 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool 394 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
395 couldn't find merge tool true specified for f 395 couldn't find merge tool true (for pattern f)
396 merging f 396 merging f
397 couldn't find merge tool true specified for f 397 couldn't find merge tool true (for pattern f)
398 merging f failed! 398 merging f failed!
399 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 399 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
400 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 400 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
401 [1] 401 [1]
402 $ aftermerge 402 $ aftermerge
416 false.whatever= 416 false.whatever=
417 true.priority=1 417 true.priority=1
418 true.executable=cat 418 true.executable=cat
419 # hg update -C 1 419 # hg update -C 1
420 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool 420 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
421 couldn't find merge tool true specified for f 421 couldn't find merge tool true (for pattern f)
422 merging f 422 merging f
423 couldn't find merge tool true specified for f 423 couldn't find merge tool true (for pattern f)
424 merging f failed! 424 merging f failed!
425 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 425 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
426 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 426 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
427 [1] 427 [1]
428 $ aftermerge 428 $ aftermerge