Mercurial > hg
comparison tests/test-histedit-merge-tools.t @ 45768:5effb1992c17
config: move ui.pre-merge-tool-output-template into [command-templates]
Differential Revision: https://phab.mercurial-scm.org/D9249
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 26 Oct 2020 10:33:32 -0700 |
parents | 15d2afa31e57 |
children | 527ce85c2e60 |
comparison
equal
deleted
inserted
replaced
45767:40411ad2f5d2 | 45768:5effb1992c17 |
---|---|
10 > [alias] | 10 > [alias] |
11 > logt = log --template '{rev}:{node|short} {desc|firstline}\n' | 11 > logt = log --template '{rev}:{node|short} {desc|firstline}\n' |
12 > [extensions] | 12 > [extensions] |
13 > histedit= | 13 > histedit= |
14 > mockmakedate = $TESTDIR/mockmakedate.py | 14 > mockmakedate = $TESTDIR/mockmakedate.py |
15 > [ui] | |
16 > pre-merge-tool-output-template='pre-merge message for {node}\n' | |
17 > EOF | 15 > EOF |
18 | 16 |
19 Merge conflict | 17 Merge conflict |
20 -------------- | 18 -------------- |
21 | 19 |
22 $ hg init r | 20 $ hg init r |
23 $ cd r | 21 $ cd r |
22 $ cat >> .hg/hgrc <<EOF | |
23 > [command-templates] | |
24 > pre-merge-tool-output='pre-merge message for {node}\n' | |
25 > EOF | |
26 | |
24 $ echo foo > file | 27 $ echo foo > file |
25 $ hg add file | 28 $ hg add file |
26 $ hg ci -m "First" -d "1 0" | 29 $ hg ci -m "First" -d "1 0" |
27 $ echo bar > file | 30 $ echo bar > file |
28 $ hg ci -m "Second" -d "2 0" | 31 $ hg ci -m "Second" -d "2 0" |
53 > pick 7181f42b8fca First | 56 > pick 7181f42b8fca First |
54 > EOF | 57 > EOF |
55 merging file | 58 merging file |
56 pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec | 59 pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec |
57 7181f42b8fca: skipping changeset (no changes) | 60 7181f42b8fca: skipping changeset (no changes) |
61 $ hg histedit --abort | |
62 abort: no histedit in progress | |
63 [255] | |
64 $ cd .. | |
65 | |
66 Test legacy config name | |
67 | |
68 $ hg init r2 | |
69 $ cd r2 | |
70 $ echo foo > file | |
71 $ hg add file | |
72 $ hg ci -m "First" | |
73 $ echo bar > file | |
74 $ hg ci -m "Second" | |
75 $ echo conflict > file | |
76 $ hg co -m 0 --config ui.merge=false \ | |
77 > --config ui.pre-merge-tool-output-template='legacy config: {node}\n' | |
78 merging file | |
79 legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7 | |
80 merging file failed! | |
81 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
82 use 'hg resolve' to retry unresolved file merges | |
83 [1] |