This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12216

windows: adjust test output in test-merge-tools.t
ClosedPublic

Authored by Alphare on Feb 25 2022, 5:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG92254dcd9255: windows: adjust test output in test-merge-tools.t

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Feb 25 2022, 5:53 AM
baymax updated this revision to Diff 32286.Feb 25 2022, 1:13 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

indygreg accepted this revision.Feb 27 2022, 5:12 PM
This revision is now accepted and ready to land.Feb 27 2022, 5:12 PM
Alphare added a commit: rHG92254dcd9255: windows: adjust test output in test-merge-tools.t.Feb 27 2022, 5:17 PM
Closed by commit rHG92254dcd9255: windows: adjust test output in test-merge-tools.t (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-tools.t (6 lines)

Diff 32288

tests/test-merge-tools.t

> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \ > --config ui.mergemarkers=detailed \
> merge -r 2 > merge -r 2
merging f merging f
arg: "ll:working copy" arg: "ll:working copy"
arg: "lo:" arg: "lo:"
arg: "merge rev" arg: "merge rev"
arg: "lb:common ancestor: */f~base" (glob) arg: "lb:common ancestor*/f~base" (glob) (no-windows !)
arg: "lb:common ancestor*\f~base" (glob) (windows !)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool' $ rm -f 'printargs_merge_tool'
Merge using a tool that supports labellocal, labelother, and labelbase, checking Merge using a tool that supports labellocal, labelother, and labelbase, checking
that they're quoted properly as well. This is using 'detailed' mergemarkers, that they're quoted properly as well. This is using 'detailed' mergemarkers,
even though ui.mergemarkers is 'basic', and using the tool's even though ui.mergemarkers is 'basic', and using the tool's
mergemarkertemplate: mergemarkertemplate:
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=basic \ > --config ui.mergemarkers=basic \
> merge -r 2 > merge -r 2
merging f merging f
arg: "ll:working copy: tooltmpl ef83787e2614" arg: "ll:working copy: tooltmpl ef83787e2614"
arg: "lo:" arg: "lo:"
arg: "merge rev: tooltmpl 0185f4e0cf02" arg: "merge rev: tooltmpl 0185f4e0cf02"
arg: "lb:common ancestor: */f~base" (glob) arg: "lb:common ancestor*/f~base" (glob) (no-windows !)
arg: "lb:common ancestor*\f~base" (glob) (windows !)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool' $ rm -f 'printargs_merge_tool'
The merge tool still gets labellocal and labelother as 'basic' even when The merge tool still gets labellocal and labelother as 'basic' even when
premerge=keep is used and has 'detailed' markers: premerge=keep is used and has 'detailed' markers:
$ beforemerge $ beforemerge