Mercurial > hg
annotate tests/test-merge-tools.t @ 41366:fabb0224a599
hghave: let OSError with ENOENT through like any other
Before this patch, if we get an OSError with ENOENT, we would not
re-raise it and would instead run into an undefined variable ("p")
soon thereafter.
Differential Revision: https://phab.mercurial-scm.org/D5631
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 17 Jan 2019 09:24:30 -0800 |
parents | ff37b1712fa5 |
children | 4764e8436b2a |
rev | line source |
---|---|
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1 test merge-tools configuration - mostly exercising filemerge.py |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
3 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
40465
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
4 $ cat >> $HGRCPATH << EOF |
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
5 > [ui] |
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
6 > merge= |
1736450cd1df
test: also deactivate `ui.merge` when testing merge tool
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
7 > EOF |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
8 $ hg init repo |
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
9 $ cd repo |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
10 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
11 revision 0 |
7731 | 12 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
13 $ echo "revision 0" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
14 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
15 $ hg commit -Am "revision 0" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
16 adding f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
17 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
18 revision 1 |
7731 | 19 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
20 $ echo "revision 1" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
21 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
22 $ hg commit -Am "revision 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
23 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
24 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
25 revision 2 |
7731 | 26 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
27 $ echo "revision 2" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
28 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
29 $ hg commit -Am "revision 2" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
30 created new head |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
31 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
32 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
33 revision 3 - simple to merge |
7731 | 34 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
35 $ echo "revision 3" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
36 $ hg commit -Am "revision 3" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
37 created new head |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
38 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
39 revision 4 - hard to merge |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
40 |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
41 $ hg update 0 > /dev/null |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
42 $ echo "revision 4" > f |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
43 $ hg commit -Am "revision 4" |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
44 created new head |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
45 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
46 $ echo "[merge-tools]" > .hg/hgrc |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
47 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
48 $ beforemerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
49 > cat .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
50 > echo "# hg update -C 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
51 > hg update -C 1 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
52 > } |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
53 $ aftermerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
54 > echo "# cat f" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
55 > cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
56 > echo "# hg stat" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 > hg stat |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
58 > echo "# hg resolve --list" |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
59 > hg resolve --list |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
60 > rm -f f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
61 > } |
7731 | 62 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
63 Tool selection |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
64 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
65 default is internal merge: |
7731 | 66 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
67 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
68 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
69 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
70 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
71 hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
73 running from a devel copy, not a temp installation |
7731 | 74 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39266
diff
changeset
|
75 $ PATH="$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
76 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
79 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
80 [1] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
81 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
82 # cat f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
83 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
84 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
85 ======= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
86 revision 2 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
87 >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
88 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
89 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
90 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
91 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
92 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
93 U f |
7731 | 94 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
95 simplest hgrc using false for merge: |
7731 | 96 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
97 $ echo "false.whatever=" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
98 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
99 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
100 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
101 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
102 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
103 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
104 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
106 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
107 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
108 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
109 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
110 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
111 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
112 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
113 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
114 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
115 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
116 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
117 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
118 #if unix-permissions |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
119 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
120 unexecutable file in $PATH shouldn't be found: |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
121 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
122 $ echo "echo fail" > false |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
123 $ hg up -qC 1 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39266
diff
changeset
|
124 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
125 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
126 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
128 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
129 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
130 $ rm false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
131 |
24809
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
132 #endif |
32d0d2f38910
tests: fix portability issue with test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
24121
diff
changeset
|
133 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
134 executable directory in $PATH shouldn't be found: |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
135 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
136 $ mkdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
137 $ hg up -qC 1 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39266
diff
changeset
|
138 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
139 merging f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
140 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
142 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
143 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
144 $ rmdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
145 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
146 true with higher .priority gets precedence: |
7731 | 147 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
148 $ echo "true.priority=1" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
149 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
150 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
151 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
152 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
153 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
154 $ hg merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
155 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
156 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
157 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
158 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
159 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
160 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
161 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
162 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
163 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
164 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
165 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
166 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
167 unless lowered on command line: |
7731 | 168 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
169 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
170 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
171 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
172 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
173 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
174 $ hg merge -r 2 --config merge-tools.true.priority=-7 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
175 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
176 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
178 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
179 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
180 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
181 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
182 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
183 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
184 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
185 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
186 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
187 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
188 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
189 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
190 or false set higher on command line: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
191 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
192 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
193 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
194 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
195 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
196 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
197 $ hg merge -r 2 --config merge-tools.false.priority=117 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
198 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
199 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
200 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
201 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
202 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
203 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
204 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
205 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
206 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
207 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
208 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
209 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
210 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
211 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
212 |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
213 or true set to disabled: |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
214 $ beforemerge |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
215 [merge-tools] |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
216 false.whatever= |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
217 true.priority=1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
218 # hg update -C 1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
219 $ hg merge -r 2 --config merge-tools.true.disabled=yes |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
220 merging f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
221 merging f failed! |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
222 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
223 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
224 [1] |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
225 $ aftermerge |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
226 # cat f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
227 revision 1 |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
228 space |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
229 # hg stat |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
230 M f |
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
231 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
232 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
233 U f |
26730
a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Augie Fackler <augie@google.com>
parents:
26614
diff
changeset
|
234 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
235 or true.executable not found in PATH: |
7731 | 236 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
237 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
238 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
239 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
240 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
241 # hg update -C 1 |
17492 | 242 $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
243 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
244 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
245 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
246 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
247 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
248 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
249 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
250 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
251 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
252 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
253 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
254 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
255 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
256 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
257 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
258 or true.executable with bogus path: |
7731 | 259 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
260 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
261 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
262 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
263 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
264 # hg update -C 1 |
17492 | 265 $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
266 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
267 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
268 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
269 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
270 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
271 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
272 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
273 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
274 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
275 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
276 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
277 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
278 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
279 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
280 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
281 but true.executable set to cat found in PATH works: |
7731 | 282 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
283 $ echo "true.executable=cat" >> .hg/hgrc |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
284 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
285 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
286 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
287 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
288 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
289 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
290 $ hg merge -r 2 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
291 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
292 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
293 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
294 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
295 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
296 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
297 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
298 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
299 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
300 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
301 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
302 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
303 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
304 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
305 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
306 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
307 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
308 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
309 and true.executable set to cat with path works: |
7731 | 310 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
311 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
312 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
313 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
314 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
315 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
316 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
317 $ hg merge -r 2 --config merge-tools.true.executable=cat |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
318 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
319 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
320 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
321 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
322 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
323 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
324 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
325 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
326 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
327 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
328 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
329 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
330 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
331 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
332 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
333 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
334 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
335 |
38041
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
336 executable set to python script that succeeds: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
337 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
338 $ cat > "$TESTTMP/myworkingmerge.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
339 > def myworkingmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
340 > return False |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
341 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
342 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
343 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
344 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
345 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
346 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
347 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
348 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:myworkingmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
349 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
350 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
351 (branch merge, don't forget to commit) |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
352 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
353 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
354 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
355 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
356 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
357 M f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
358 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
359 R f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
360 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
361 executable set to python script that fails: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
362 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
363 $ cat > "$TESTTMP/mybrokenmerge.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
364 > def mybrokenmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
365 > ui.write(b"some fail message\n") |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
366 > return True |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
367 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
368 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
369 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
370 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
371 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
372 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
373 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
374 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/mybrokenmerge.py:mybrokenmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
375 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
376 some fail message |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
377 abort: $TESTTMP/mybrokenmerge.py hook failed |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
378 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
379 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
380 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
381 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
382 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
383 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
384 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
385 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
386 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
387 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
388 executable set to python script that is missing function: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
389 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
390 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
391 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
392 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
393 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
394 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
395 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
396 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:missingFunction" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
397 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
398 abort: $TESTTMP/myworkingmerge.py does not have function: missingFunction |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
399 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
400 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
401 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
402 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
403 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
404 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
405 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
406 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
407 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
408 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
409 executable set to missing python script: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
410 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
411 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
412 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
413 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
414 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
415 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
416 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
417 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/missingpythonscript.py:mergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
418 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
419 abort: loading python merge script failed: $TESTTMP/missingpythonscript.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
420 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
421 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
422 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
423 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
424 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
425 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
426 ? f.orig |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
427 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
428 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
429 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
430 executable set to python script but callable function is missing: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
431 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
432 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
433 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
434 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
435 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
436 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
437 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
438 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
439 abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
440 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
441 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
442 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
443 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
444 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
445 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
446 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
447 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
448 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
449 executable set to python script but callable function is empty string: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
450 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
451 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
452 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
453 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
454 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
455 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
456 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
457 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
458 abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
459 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
460 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
461 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
462 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
463 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
464 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
465 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
466 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
467 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
468 executable set to python script but callable function is missing and path contains colon: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
469 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
470 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
471 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
472 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
473 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
474 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
475 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
476 $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/some:dir/myworkingmerge.py" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
477 abort: invalid 'python:' syntax: python:$TESTTMP/some:dir/myworkingmerge.py |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
478 [255] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
479 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
480 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
481 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
482 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
483 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
484 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
485 U f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
486 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
487 executable set to python script filename that contains spaces: |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
488 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
489 $ mkdir -p "$TESTTMP/my path" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
490 $ cat > "$TESTTMP/my path/my working merge with spaces in filename.py" <<EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
491 > def myworkingmergefn(ui, repo, args, **kwargs): |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
492 > return False |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
493 > EOF |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
494 $ beforemerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
495 [merge-tools] |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
496 false.whatever= |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
497 true.priority=1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
498 true.executable=cat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
499 # hg update -C 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
500 $ hg merge -r 2 --config "merge-tools.true.executable=python:$TESTTMP/my path/my working merge with spaces in filename.py:myworkingmergefn" |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
501 merging f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
502 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
503 (branch merge, don't forget to commit) |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
504 $ aftermerge |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
505 # cat f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
506 revision 1 |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
507 space |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
508 # hg stat |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
509 M f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
510 # hg resolve --list |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
511 R f |
242eb5132203
filemerge: support specifying a python function to custom merge-tools
hindlemail <tom_hindle@sil.org>
parents:
38029
diff
changeset
|
512 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
513 #if unix-permissions |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
514 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
515 environment variables in true.executable are handled: |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
516 |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
517 $ echo 'echo "custom merge tool"' > .hg/merge.sh |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
518 $ beforemerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
519 [merge-tools] |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
520 false.whatever= |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
521 true.priority=1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
522 true.executable=cat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
523 # hg update -C 1 |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
524 $ hg --config merge-tools.true.executable='sh' \ |
19264
eac114e13b96
tests: avoid writing files to HGTMP
Matt Mackall <mpm@selenic.com>
parents:
18325
diff
changeset
|
525 > --config merge-tools.true.args=.hg/merge.sh \ |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
526 > merge -r 2 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
527 merging f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
528 custom merge tool |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
529 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
530 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
531 $ aftermerge |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
532 # cat f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
533 revision 1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
534 space |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
535 # hg stat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
536 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
537 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
538 R f |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
539 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
540 #endif |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16967
diff
changeset
|
541 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
542 Tool selection and merge-patterns |
7731 | 543 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
544 merge-patterns specifies new tool false: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
545 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
546 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
547 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
548 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
549 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
550 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
551 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
552 $ hg merge -r 2 --config merge-patterns.f=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
553 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
554 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
555 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
556 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
557 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
558 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
559 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
560 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
561 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
562 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
563 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
564 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
565 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
566 U f |
7731 | 567 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
568 merge-patterns specifies executable not found in PATH and gets warning: |
7731 | 569 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
570 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
571 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
572 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
573 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
574 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
575 # hg update -C 1 |
17492 | 576 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
577 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
578 merging f |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
579 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
580 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
581 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
582 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
583 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
584 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
585 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
586 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
587 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
588 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
589 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
590 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
591 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
592 U f |
7731 | 593 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
594 merge-patterns specifies executable with bogus path and gets warning: |
7731 | 595 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
596 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
597 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
598 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
599 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
600 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
601 # hg update -C 1 |
17492 | 602 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
603 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
604 merging f |
32254
177742666abd
filemerge: make warning message more i18n friendly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32253
diff
changeset
|
605 couldn't find merge tool true (for pattern f) |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
606 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
607 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
608 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
609 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
610 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
611 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
612 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
613 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
614 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
615 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
616 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
617 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
618 U f |
7731 | 619 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
620 ui.merge overrules priority |
7731 | 621 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
622 ui.merge specifies false: |
7731 | 623 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
624 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
625 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
626 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
627 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
628 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
629 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
630 $ hg merge -r 2 --config ui.merge=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
631 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
632 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
633 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
634 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
635 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
636 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
637 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
638 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
639 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
640 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
641 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
642 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
643 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
644 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
645 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
646 ui.merge specifies internal:fail: |
7731 | 647 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
648 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
649 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
650 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
651 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
652 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
653 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
654 $ hg merge -r 2 --config ui.merge=internal:fail |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
655 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
656 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
657 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
658 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
659 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
660 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
661 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
662 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
663 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
664 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
665 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
666 |
22706
ad25986c4cd3
filemerge: introduce :x as short version of internal:x merge tool name
Mads Kiilerich <madski@unity3d.com>
parents:
22032
diff
changeset
|
667 ui.merge specifies :local (without internal prefix): |
7731 | 668 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
669 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
670 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
671 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
672 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
673 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
674 # hg update -C 1 |
22706
ad25986c4cd3
filemerge: introduce :x as short version of internal:x merge tool name
Mads Kiilerich <madski@unity3d.com>
parents:
22032
diff
changeset
|
675 $ hg merge -r 2 --config ui.merge=:local |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
676 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
677 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
678 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
679 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
680 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
681 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
682 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
683 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
684 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
685 R f |
7731 | 686 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
687 ui.merge specifies internal:other: |
7731 | 688 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
689 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
690 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
691 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
692 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
693 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
694 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
695 $ hg merge -r 2 --config ui.merge=internal:other |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
696 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
697 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
698 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
699 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
700 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
701 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
702 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
703 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
704 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
705 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
706 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
707 ui.merge specifies internal:prompt: |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
708 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
709 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
710 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
711 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
712 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
713 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
714 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
715 $ hg merge -r 2 --config ui.merge=internal:prompt |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
716 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
717 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
718 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
719 [1] |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
720 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
721 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
722 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
723 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
724 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
725 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
726 # hg resolve --list |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
727 U f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
728 |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
729 ui.merge specifies :prompt, with 'leave unresolved' chosen |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
730 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
731 $ beforemerge |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
732 [merge-tools] |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
733 false.whatever= |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
734 true.priority=1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
735 true.executable=cat |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
736 # hg update -C 1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
737 $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
738 > u |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
739 > EOF |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
740 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
741 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
742 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
27162
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
743 [1] |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
744 $ aftermerge |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
745 # cat f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
746 revision 1 |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
747 space |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
748 # hg stat |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
749 M f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
750 # hg resolve --list |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
751 U f |
4ab69be0ea15
filemerge: add a 'leave unresolved' option to regular prompts
Siddharth Agarwal <sid0@fb.com>
parents:
26967
diff
changeset
|
752 |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
753 prompt with EOF |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
754 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
755 $ beforemerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
756 [merge-tools] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
757 false.whatever= |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
758 true.priority=1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
759 true.executable=cat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
760 # hg update -C 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
761 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
762 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
763 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
764 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
765 [1] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
766 $ aftermerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
767 # cat f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
768 revision 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
769 space |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
770 # hg stat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
771 M f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
772 # hg resolve --list |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
773 U f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
774 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
775 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
26898
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
776 [1] |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
777 $ aftermerge |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
778 # cat f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
779 revision 1 |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
780 space |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
781 # hg stat |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
782 M f |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
783 ? f.orig |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
784 # hg resolve --list |
33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
Siddharth Agarwal <sid0@fb.com>
parents:
26897
diff
changeset
|
785 U f |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
786 $ rm f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
787 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
788 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
789 [1] |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
790 $ aftermerge |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
791 # cat f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
792 revision 1 |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
793 space |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
794 # hg stat |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
795 M f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
796 # hg resolve --list |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
797 U f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
798 $ hg resolve --all --config ui.merge=internal:prompt |
32253
7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30538
diff
changeset
|
799 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
800 [1] |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
801 $ aftermerge |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
802 # cat f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
803 revision 1 |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
804 space |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
805 # hg stat |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
806 M f |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
807 ? f.orig |
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
808 # hg resolve --list |
27164
88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
27162
diff
changeset
|
809 U f |
26899
5f88e092f82c
resolve: don't abort when file is missing
Siddharth Agarwal <sid0@fb.com>
parents:
26898
diff
changeset
|
810 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
811 ui.merge specifies internal:dump: |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
812 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
813 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
814 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
815 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
816 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
817 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
818 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
819 $ hg merge -r 2 --config ui.merge=internal:dump |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
820 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
821 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
822 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
823 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
824 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
825 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
826 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
827 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
828 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
829 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
830 ? f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
831 ? f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
832 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
833 ? f.other |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
834 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
835 U f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
836 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
837 f.base: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
838 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
839 $ cat f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
840 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
841 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
842 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
843 f.local: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
844 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
845 $ cat f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
846 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
847 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
848 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
849 f.other: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
850 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
851 $ cat f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
852 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
853 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
854 $ rm f.base f.local f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
855 |
32255
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
856 check that internal:dump doesn't dump files if premerge runs |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
857 successfully |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
858 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
859 $ beforemerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
860 [merge-tools] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
861 false.whatever= |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
862 true.priority=1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
863 true.executable=cat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
864 # hg update -C 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
865 $ hg merge -r 3 --config ui.merge=internal:dump |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
866 merging f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
867 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
868 (branch merge, don't forget to commit) |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
869 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
870 $ aftermerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
871 # cat f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
872 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
873 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
874 revision 3 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
875 # hg stat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
876 M f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
877 # hg resolve --list |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
878 R f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
879 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
880 check that internal:forcedump dumps files, even if local and other can |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
881 be merged easily |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
882 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
883 $ beforemerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
884 [merge-tools] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
885 false.whatever= |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
886 true.priority=1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
887 true.executable=cat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
888 # hg update -C 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
889 $ hg merge -r 3 --config ui.merge=internal:forcedump |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
890 merging f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
891 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
892 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
32255
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
893 [1] |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
894 $ aftermerge |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
895 # cat f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
896 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
897 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
898 # hg stat |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
899 M f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
900 ? f.base |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
901 ? f.local |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
902 ? f.orig |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
903 ? f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
904 # hg resolve --list |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
905 U f |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
906 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
907 $ cat f.base |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
908 revision 0 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
909 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
910 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
911 $ cat f.local |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
912 revision 1 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
913 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
914 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
915 $ cat f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
916 revision 0 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
917 space |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
918 revision 3 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
919 |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
920 $ rm -f f.base f.local f.other |
7e35d31b41fd
filemerge: add internal merge tool to dump files forcibly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32254
diff
changeset
|
921 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
922 ui.merge specifies internal:other but is overruled by pattern for false: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
923 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
924 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
925 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
926 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
927 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
928 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
929 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
930 $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
931 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
932 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
933 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
934 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
935 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
936 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
937 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
938 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
939 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
940 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
941 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
942 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
943 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
944 U f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
945 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
946 Premerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
947 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
948 ui.merge specifies internal:other but is overruled by --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
949 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
950 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
951 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
952 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
953 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
954 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
955 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
956 $ hg merge -r 2 --config ui.merge=internal:other --tool=false |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
957 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
958 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
959 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
960 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
961 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
962 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
963 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
964 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
965 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
966 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
967 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
968 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
969 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
970 U f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
971 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
972 HGMERGE specifies internal:other but is overruled by --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
973 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
974 $ HGMERGE=internal:other ; export HGMERGE |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
975 $ beforemerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
976 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
977 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
978 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
979 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
980 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
981 $ hg merge -r 2 --tool=false |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
982 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
983 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
984 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
985 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
986 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
987 $ aftermerge |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
988 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
989 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
990 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
991 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
992 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
993 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
994 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
995 U f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
996 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
997 $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
998 |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
999 update is a merge ... |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1000 |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1001 (this also tests that files reverted with '--rev REV' are treated as |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1002 "modified", even if none of mode, size and timestamp of them isn't |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1003 changed on the filesystem (see also issue4583)) |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1004 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1005 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1006 > [fakedirstatewritetime] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1007 > # emulate invoking dirstate.write() via repo.status() |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1008 > # at 2000-01-01 00:00 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1009 > fakenow = 200001010000 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1010 > EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1011 |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1012 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1013 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1014 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1015 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1016 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1017 # hg update -C 1 |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1018 $ hg update -q 0 |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1019 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1020 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1021 $ touch -t 200001010000 f |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1022 $ hg debugrebuildstate |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1023 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1024 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1025 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1026 > EOF |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1027 $ hg revert -q -r 1 . |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1028 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1029 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1030 > fakedirstatewritetime = ! |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1031 > EOF |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1032 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1033 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1034 $ touch -t 200001010000 f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1035 $ hg status f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1036 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1037 $ hg update -r 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1038 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1039 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1040 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1041 revision 0 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1042 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1043 revision 2 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1044 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1045 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1046 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1047 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1048 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1049 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1050 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1051 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1052 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1053 R f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1054 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1055 update should also have --tool |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1056 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1057 $ beforemerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1058 [merge-tools] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1059 false.whatever= |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1060 true.priority=1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1061 true.executable=cat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1062 # hg update -C 1 |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1063 $ hg update -q 0 |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1064 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1065 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1066 $ touch -t 200001010000 f |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1067 $ hg debugrebuildstate |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1068 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1069 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1070 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1071 > EOF |
24121
9d0b6ef92eb2
test-merge-tools: fix flaky test by avoiding debugsetparents
Martin von Zweigbergk <martinvonz@google.com>
parents:
22707
diff
changeset
|
1072 $ hg revert -q -r 1 . |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1073 $ cat >> $HGRCPATH <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1074 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1075 > fakedirstatewritetime = ! |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24843
diff
changeset
|
1076 > EOF |
24843
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1077 $ f -s f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1078 f: size=17 |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1079 $ touch -t 200001010000 f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1080 $ hg status f |
21b33f0460e0
revert: apply normallookup on reverted file if size isn't changed (issue4583)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
24809
diff
changeset
|
1081 M f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1082 $ hg update -r 2 --tool false |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1083 merging f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1084 merging f failed! |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1085 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1086 use 'hg resolve' to retry unresolved file merges |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1087 [1] |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1088 $ aftermerge |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1089 # cat f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1090 revision 1 |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1091 space |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1092 # hg stat |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1093 M f |
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1094 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1095 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1096 U f |
21552
61151f429a5f
update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com>
parents:
21519
diff
changeset
|
1097 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1098 Default is silent simplemerge: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
1099 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1100 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1101 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1102 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1103 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1104 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1105 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1106 $ hg merge -r 3 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1107 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1108 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1109 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1110 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1111 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1112 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1113 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1114 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1115 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1116 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1117 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1118 R f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1119 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1120 .premerge=True is same: |
7731 | 1121 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1122 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1123 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1124 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1125 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1126 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1127 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1128 $ hg merge -r 3 --config merge-tools.true.premerge=True |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1129 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1130 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1131 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1132 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1133 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1134 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1135 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1136 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1137 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1138 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1139 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1140 R f |
7731 | 1141 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1142 .premerge=False executes merge-tool: |
7731 | 1143 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1144 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1145 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1146 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1147 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1148 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1149 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1150 $ hg merge -r 3 --config merge-tools.true.premerge=False |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1151 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1152 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1153 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1154 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1155 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1156 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1157 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1158 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1159 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1160 (branch merge, don't forget to commit) |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1161 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1162 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1163 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1164 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1165 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1166 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1167 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1168 R f |
7731 | 1169 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1170 premerge=keep keeps conflict markers in: |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1171 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1172 $ beforemerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1173 [merge-tools] |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1174 false.whatever= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1175 true.priority=1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1176 true.executable=cat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1177 # hg update -C 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1178 $ hg merge -r 4 --config merge-tools.true.premerge=keep |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1179 merging f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1180 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1181 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1182 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1183 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1184 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1185 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1186 revision 0 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1187 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1188 revision 4 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1189 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1190 (branch merge, don't forget to commit) |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1191 $ aftermerge |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1192 # cat f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1193 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1194 revision 1 |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1195 space |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1196 ======= |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1197 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1198 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1199 # hg stat |
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1200 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1201 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1202 R f |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1203 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1204 premerge=keep-merge3 keeps conflict markers with base content: |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1205 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1206 $ beforemerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1207 [merge-tools] |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1208 false.whatever= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1209 true.priority=1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1210 true.executable=cat |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1211 # hg update -C 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1212 $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1213 merging f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1214 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1215 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1216 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1217 ||||||| base |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1218 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1219 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1220 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1221 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1222 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1223 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1224 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1225 revision 4 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1226 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1227 (branch merge, don't forget to commit) |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1228 $ aftermerge |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1229 # cat f |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1230 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1231 revision 1 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1232 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1233 ||||||| base |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1234 revision 0 |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1235 space |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1236 ======= |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1237 revision 4 |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
27164
diff
changeset
|
1238 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1239 # hg stat |
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1240 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1241 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1242 R f |
22032
d7f25834ffbb
merge-tools: add a `premerge=keep-merge3` config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22030
diff
changeset
|
1243 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1244 premerge=keep respects ui.mergemarkers=basic: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1245 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1246 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1247 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1248 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1249 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1250 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1251 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1252 $ hg merge -r 4 --config merge-tools.true.premerge=keep --config ui.mergemarkers=basic |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1253 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1254 <<<<<<< working copy |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1255 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1256 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1257 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1258 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1259 >>>>>>> merge rev |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1260 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1261 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1262 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1263 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1264 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1265 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1266 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1267 <<<<<<< working copy |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1268 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1269 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1270 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1271 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1272 >>>>>>> merge rev |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1273 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1274 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1275 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1276 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1277 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1278 premerge=keep ignores ui.mergemarkers=basic if true.mergemarkers=detailed: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1279 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1280 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1281 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1282 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1283 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1284 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1285 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1286 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1287 > --config ui.mergemarkers=basic \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1288 > --config merge-tools.true.mergemarkers=detailed |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1289 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1290 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1291 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1292 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1293 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1294 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1295 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1296 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1297 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1298 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1299 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1300 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1301 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1302 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1303 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1304 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1305 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1306 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1307 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1308 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1309 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1310 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1311 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1312 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1313 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1314 premerge=keep respects ui.mergemarkertemplate instead of |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1315 true.mergemarkertemplate if true.mergemarkers=basic: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1316 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1317 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1318 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1319 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1320 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1321 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1322 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1323 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1324 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1325 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1326 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1327 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1328 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1329 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1330 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1331 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1332 >>>>>>> merge rev: uitmpl 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1333 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1334 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1335 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1336 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1337 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1338 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1339 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1340 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1341 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1342 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1343 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1344 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1345 >>>>>>> merge rev: uitmpl 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1346 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1347 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1348 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1349 R f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1350 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1351 premerge=keep respects true.mergemarkertemplate instead of |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1352 true.mergemarkertemplate if true.mergemarkers=detailed: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1353 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1354 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1355 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1356 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1357 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1358 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1359 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1360 $ hg merge -r 4 --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1361 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1362 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1363 > --config merge-tools.true.mergemarkers=detailed |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1364 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1365 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1366 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1367 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1368 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1369 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1370 >>>>>>> merge rev: tooltmpl 81448d39c9a0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1371 revision 0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1372 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1373 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1374 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1375 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1376 $ aftermerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1377 # cat f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1378 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1379 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1380 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1381 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1382 revision 4 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1383 >>>>>>> merge rev: tooltmpl 81448d39c9a0 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1384 # hg stat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1385 M f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1386 # hg resolve --list |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1387 R f |
22030
ecdff28d13e2
mergetools: add a test for premerge --keep
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22029
diff
changeset
|
1388 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1389 Tool execution |
7731 | 1390 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1391 set tools.args explicit to include $base $local $other $output: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1392 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1393 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1394 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1395 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1396 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1397 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1398 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1399 $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1400 > | sed 's,==> .* <==,==> ... <==,g' |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1401 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1402 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1403 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1404 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1405 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1406 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1407 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1408 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1409 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1410 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1411 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1412 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1413 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1414 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1415 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1416 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1417 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1418 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1419 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1420 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1421 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1422 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1423 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1424 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1425 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1426 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1427 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1428 Merge with "echo mergeresult > $local": |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1429 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1430 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1431 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1432 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1433 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1434 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1435 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1436 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1437 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1438 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1439 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1440 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1441 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1442 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1443 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1444 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1445 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1446 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1447 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1448 - and $local is the file f: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1449 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1450 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1451 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1452 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1453 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1454 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1455 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1456 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1457 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1458 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1459 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1460 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1461 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1462 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1463 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1464 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1465 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1466 R f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1467 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1468 Merge with "echo mergeresult > $output" - the variable is a bit magic: |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
1469 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1470 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1471 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1472 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1473 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1474 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1475 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1476 $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1477 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1478 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1479 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1480 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1481 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1482 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1483 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1484 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1485 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1486 R f |
7731 | 1487 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1488 Merge using tool with a path that must be quoted: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1489 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1490 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1491 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1492 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1493 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1494 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1495 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1496 $ cat <<EOF > 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1497 > cat "\$1" "\$2" "\$3" > "\$4" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1498 > EOF |
16967
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1499 $ hg --config merge-tools.true.executable='sh' \ |
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1500 > --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \ |
30cfa286947c
test-merge-tools: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16961
diff
changeset
|
1501 > merge -r 2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1502 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1503 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1504 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1505 $ rm -f 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1506 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1507 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1508 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1509 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1510 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1511 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1512 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1513 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1514 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1515 M f |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1516 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1517 R f |
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
1518 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1519 Merge using a tool that supports labellocal, labelother, and labelbase, checking |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1520 that they're quoted properly as well. This is using the default 'basic' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1521 mergemarkers even though ui.mergemarkers is 'detailed', so it's ignoring both |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1522 mergemarkertemplate settings: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1523 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1524 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1525 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1526 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1527 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1528 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1529 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1530 $ cat <<EOF > printargs_merge_tool |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1531 > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1532 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1533 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1534 > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1535 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1536 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1537 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1538 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1539 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1540 arg: "ll:working copy" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1541 arg: "lo:" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1542 arg: "merge rev" |
36054
fe5c4b795999
test-merge-tools: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35992
diff
changeset
|
1543 arg: "lb:base: */f~base.*" (glob) |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1544 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1545 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1546 $ rm -f 'printargs_merge_tool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1547 |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1548 Same test with experimental.mergetempdirprefix set: |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1549 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1550 $ beforemerge |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1551 [merge-tools] |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1552 false.whatever= |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1553 true.priority=1 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1554 true.executable=cat |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1555 # hg update -C 1 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1556 $ cat <<EOF > printargs_merge_tool |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1557 > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1558 > EOF |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1559 $ hg --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1560 > --config merge-tools.true.executable='sh' \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1561 > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1562 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1563 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1564 > --config ui.mergemarkers=detailed \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1565 > merge -r 2 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1566 merging f |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1567 arg: "ll:working copy" |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1568 arg: "lo:" |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1569 arg: "merge rev" |
37023
6bc2f1b3bc9d
test-merge-tools: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36999
diff
changeset
|
1570 arg: "lb:base: */hgmerge.*/f~base" (glob) |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1571 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1572 (branch merge, don't forget to commit) |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1573 $ rm -f 'printargs_merge_tool' |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1574 |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1575 Merge using a tool that supports labellocal, labelother, and labelbase, checking |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1576 that they're quoted properly as well. This is using 'detailed' mergemarkers, |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1577 even though ui.mergemarkers is 'basic', and using the tool's |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1578 mergemarkertemplate: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1579 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1580 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1581 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1582 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1583 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1584 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1585 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1586 $ cat <<EOF > printargs_merge_tool |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1587 > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1588 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1589 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1590 > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1591 > --config merge-tools.true.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1592 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1593 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1594 > --config ui.mergemarkers=basic \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1595 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1596 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1597 arg: "ll:working copy: tooltmpl ef83787e2614" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1598 arg: "lo:" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1599 arg: "merge rev: tooltmpl 0185f4e0cf02" |
36054
fe5c4b795999
test-merge-tools: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35992
diff
changeset
|
1600 arg: "lb:base: */f~base.*" (glob) |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1601 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1602 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1603 $ rm -f 'printargs_merge_tool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1604 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1605 The merge tool still gets labellocal and labelother as 'basic' even when |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1606 premerge=keep is used and has 'detailed' markers: |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1607 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1608 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1609 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1610 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1611 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1612 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1613 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1614 $ cat <<EOF > mytool |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1615 > echo labellocal: \"\$1\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1616 > echo labelother: \"\$2\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1617 > echo "output (arg)": \"\$3\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1618 > echo "output (contents)": |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1619 > cat "\$3" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1620 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1621 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1622 > --config merge-tools.true.args='mytool $labellocal $labelother $output' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1623 > --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1624 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1625 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1626 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1627 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1628 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1629 labellocal: "working copy" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1630 labelother: "merge rev" |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1631 output (arg): "$TESTTMP/repo/f" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1632 output (contents): |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1633 <<<<<<< working copy: uitmpl 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1634 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1635 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1636 revision 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1637 >>>>>>> merge rev: uitmpl 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1638 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1639 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1640 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1641 $ rm -f 'mytool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1642 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1643 premerge=keep uses the *tool's* mergemarkertemplate if tool's |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1644 mergemarkers=detailed; labellocal and labelother also use the tool's template |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1645 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1646 $ beforemerge |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1647 [merge-tools] |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1648 false.whatever= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1649 true.priority=1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1650 true.executable=cat |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1651 # hg update -C 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1652 $ cat <<EOF > mytool |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1653 > echo labellocal: \"\$1\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1654 > echo labelother: \"\$2\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1655 > echo "output (arg)": \"\$3\" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1656 > echo "output (contents)": |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1657 > cat "\$3" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1658 > EOF |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1659 $ hg --config merge-tools.true.executable='sh' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1660 > --config merge-tools.true.args='mytool $labellocal $labelother $output' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1661 > --config merge-tools.true.premerge=keep \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1662 > --config merge-tools.true.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1663 > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1664 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1665 > --config ui.mergemarkers=detailed \ |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1666 > merge -r 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1667 merging f |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1668 labellocal: "working copy: tooltmpl ef83787e2614" |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1669 labelother: "merge rev: tooltmpl 0185f4e0cf02" |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1670 output (arg): "$TESTTMP/repo/f" |
35907
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1671 output (contents): |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1672 <<<<<<< working copy: tooltmpl ef83787e2614 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1673 revision 1 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1674 ======= |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1675 revision 2 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1676 >>>>>>> merge rev: tooltmpl 0185f4e0cf02 |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1677 space |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1678 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1679 (branch merge, don't forget to commit) |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1680 $ rm -f 'mytool' |
9037c29e9f53
filemerge: support passing labels to external merge tools
Kyle Lippincott <spectral@google.com>
parents:
35704
diff
changeset
|
1681 |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1682 Issue3581: Merging a filename that needs to be quoted |
17902
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1683 (This test doesn't work on Windows filesystems even on Linux, so check |
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1684 for Unix-like permission) |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1685 |
17902
195ad823b5d5
tests: fix test for issue3581 for vfat on Linux
Matt Mackall <mpm@selenic.com>
parents:
17901
diff
changeset
|
1686 #if unix-permissions |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1687 $ beforemerge |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1688 [merge-tools] |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1689 false.whatever= |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1690 true.priority=1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1691 true.executable=cat |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1692 # hg update -C 1 |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1693 $ echo "revision 5" > '"; exit 1; echo "' |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1694 $ hg commit -Am "revision 5" |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1695 adding "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1696 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1697 $ hg update -C 1 > /dev/null |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1698 $ echo "revision 6" > '"; exit 1; echo "' |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1699 $ hg commit -Am "revision 6" |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1700 adding "; exit 1; echo " |
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1701 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1702 created new head |
22029
f28329171a86
test-merge-tools: introduce a "revision 4" that merges with conflict
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21693
diff
changeset
|
1703 $ hg merge --config merge-tools.true.executable="true" -r 5 |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1704 merging "; exit 1; echo " |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1705 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1706 (branch merge, don't forget to commit) |
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1707 $ hg update -C 1 > /dev/null |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1708 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1709 #else |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1710 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1711 Match the non-portable filename commits above for test stability |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1712 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1713 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1714 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1715 > revision 5 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1716 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1717 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1718 > new file mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1719 > --- /dev/null |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1720 > +++ b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1721 > @@ -0,0 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1722 > +revision 5 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1723 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1724 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1725 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1726 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1727 > revision 6 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1728 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1729 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1730 > new file mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1731 > --- /dev/null |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1732 > +++ b/"; exit 1; echo " |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1733 > @@ -0,0 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1734 > +revision 6 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1735 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1736 |
17901
a19046744e4e
filemerge: only run test for issue3581 on non-windows environments
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17885
diff
changeset
|
1737 #endif |
17885
9a2cf955db84
filemerge: use util.shellquote when calling merge (issue3581)
Keegan Carruthers-Smith <keegancsmith@fb.com>
parents:
17492
diff
changeset
|
1738 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1739 Merge post-processing |
7731 | 1740 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1741 cat is a bad merge-tool and doesn't change: |
7731 | 1742 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1743 $ beforemerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1744 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1745 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1746 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1747 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1748 # hg update -C 1 |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1749 $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
1750 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1751 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1752 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1753 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1754 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1755 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1756 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1757 output file f appears unchanged |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1758 was merge successful (yn)? n |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1759 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1760 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
1761 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
16961
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1762 [1] |
cdbb53a640c1
test-merge-tools: inline pointless domerge function
Adrian Buehlmann <adrian@cadifra.com>
parents:
15545
diff
changeset
|
1763 $ aftermerge |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1764 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1765 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1766 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1767 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1768 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1769 ? f.orig |
26897
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1770 # hg resolve --list |
da1c706c9a35
test-merge-tools.t: add 'hg resolve --list' output to tests
Siddharth Agarwal <sid0@fb.com>
parents:
26730
diff
changeset
|
1771 U f |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1772 |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1773 missingbinary is a merge-tool that doesn't exist: |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1774 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1775 $ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1776 $ beforemerge |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1777 [merge-tools] |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1778 false.whatever= |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1779 true.priority=1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1780 true.executable=cat |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1781 missingbinary.executable=doesnotexist |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1782 # hg update -C 1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1783 $ hg merge -y -r 2 --config ui.merge=missingbinary |
38952
0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
Martin von Zweigbergk <martinvonz@google.com>
parents:
38951
diff
changeset
|
1784 couldn't find merge tool missingbinary (for pattern f) |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1785 merging f |
38952
0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
Martin von Zweigbergk <martinvonz@google.com>
parents:
38951
diff
changeset
|
1786 couldn't find merge tool missingbinary (for pattern f) |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1787 revision 1 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1788 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1789 revision 0 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1790 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1791 revision 2 |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1792 space |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1793 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1794 (branch merge, don't forget to commit) |
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1795 |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1796 $ hg update -q -C 1 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1797 $ rm f |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1798 |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1799 internal merge cannot handle symlinks and shouldn't try: |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1800 |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1801 #if symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1802 |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1803 $ ln -s symlink f |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1804 $ hg commit -qm 'f is symlink' |
39183
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1805 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1806 #else |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1807 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1808 $ hg import --bypass -q - << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1809 > # HG changeset patch |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1810 > f is symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1811 > |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1812 > diff --git a/f b/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1813 > old mode 100644 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1814 > new mode 120000 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1815 > --- a/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1816 > +++ b/f |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1817 > @@ -1,2 +1,1 @@ |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1818 > -revision 1 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1819 > -space |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1820 > +symlink |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1821 > \ No newline at end of file |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1822 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1823 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1824 Resolve 'other [destination] changed f which local [working copy] deleted' prompt |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1825 $ hg up -q -C --config ui.interactive=True << EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1826 > c |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1827 > EOF |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1828 |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1829 #endif |
7a111168659e
tests: stabilize test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39125
diff
changeset
|
1830 |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1831 $ hg merge -r 2 --tool internal:merge |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1832 merging f |
22707
38e0363dcbe0
filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich <madski@unity3d.com>
parents:
22706
diff
changeset
|
1833 warning: internal :merge cannot merge symlinks for f |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
1834 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1835 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32256
diff
changeset
|
1836 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
18256
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1837 [1] |
d084df89d948
merge: make internal merge fail cleanly on symlinks
Mads Kiilerich <mads@kiilerich.com>
parents:
17902
diff
changeset
|
1838 |
30538
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1839 Verify naming of temporary files and that extension is preserved: |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1840 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1841 $ hg update -q -C 1 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1842 $ hg mv f f.txt |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1843 $ hg ci -qm "f.txt" |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1844 $ hg update -q -C 2 |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1845 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1846 merging f and f.txt to f.txt |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1847 */f~base.* */f~local.*.txt */f~other.*.txt $TESTTMP/repo/f.txt (glob) |
30538
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1848 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
c2154979409d
merge: use original file extension for temporary files
Mads Kiilerich <madski@unity3d.com>
parents:
30460
diff
changeset
|
1849 (branch merge, don't forget to commit) |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1850 |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1851 Verify naming of temporary files and that extension is preserved |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1852 (experimental.mergetempdirprefix version): |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1853 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1854 $ hg update -q -C 1 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1855 $ hg mv f f.txt |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1856 $ hg ci -qm "f.txt" |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1857 $ hg update -q -C 2 |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1858 $ hg merge -y -r tip --tool echo \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1859 > --config merge-tools.echo.args='$base $local $other $output' \ |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1860 > --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1861 merging f and f.txt to f.txt |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
1862 $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob) |
36999
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1863 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1864 (branch merge, don't forget to commit) |
e349ad5cbb71
filemerge: use a single temp dir instead of temp files
Kyle Lippincott <spectral@google.com>
parents:
36992
diff
changeset
|
1865 |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1866 Binary files capability checking |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1867 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1868 $ hg update -q -C 0 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1869 $ python <<EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1870 > with open('b', 'wb') as fp: |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1871 > fp.write(b'\x00\x01\x02\x03') |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1872 > EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1873 $ hg add b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1874 $ hg commit -qm "add binary file (#1)" |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1875 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1876 $ hg update -q -C 0 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1877 $ python <<EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1878 > with open('b', 'wb') as fp: |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1879 > fp.write(b'\x03\x02\x01\x00') |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1880 > EOF |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1881 $ hg add b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1882 $ hg commit -qm "add binary file (#2)" |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1883 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1884 By default, binary files capability of internal merge tools is not |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1885 checked strictly. |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1886 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1887 (for merge-patterns, chosen unintentionally) |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1888 |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1889 $ hg merge 9 \ |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1890 > --config merge-patterns.b=:merge-other \ |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1891 > --config merge-patterns.re:[a-z]=:other |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1892 warning: check merge-patterns configurations, if ':merge-other' for binary file 'b' is unintentional |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1893 (see 'hg help merge-tools' for binary files capability) |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1894 merging b |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1895 warning: b looks like a binary file. |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1896 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1897 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1898 [1] |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1899 $ hg merge --abort -q |
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
1900 |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1901 (for ui.merge, ignored unintentionally) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1902 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1903 $ hg merge 9 \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1904 > --config merge-tools.:other.binary=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1905 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1906 tool :other (for pattern b) can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1907 tool true can't handle binary |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1908 tool :other can't handle binary |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1909 tool false can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1910 no tool found to merge b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1911 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for b? u |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1912 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1913 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1914 [1] |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1915 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1916 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1917 With merge.strict-capability-check=true, binary files capability of |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1918 internal merge tools is checked strictly. |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1919 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1920 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1921 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1922 0000: 03 02 01 00 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1923 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1924 (for merge-patterns) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1925 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1926 $ hg merge 9 --config merge.strict-capability-check=true \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
1927 > --config merge-tools.:merge-other.binary=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1928 > --config merge-patterns.b=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1929 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1930 tool :merge-other (for pattern b) can't handle binary |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1931 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1932 (branch merge, don't forget to commit) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1933 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1934 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1935 0000: 00 01 02 03 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1936 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1937 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1938 (for ui.merge) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1939 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1940 $ hg merge 9 --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1941 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1942 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1943 (branch merge, don't forget to commit) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1944 $ f --hexdump b |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1945 b: |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1946 0000: 00 01 02 03 |....| |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1947 $ hg merge --abort -q |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
1948 |
40478
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1949 Check that the extra information is printed correctly |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1950 |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1951 $ hg merge 9 \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1952 > --config merge-tools.testecho.executable='echo' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1953 > --config merge-tools.testecho.args='merge runs here ...' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1954 > --config merge-tools.testecho.binary=True \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1955 > --config ui.merge=testecho \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1956 > --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \ |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1957 > --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"' |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1958 merging b |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1959 |
40486
ff37b1712fa5
tests: conditonalize a difference in test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40478
diff
changeset
|
1960 Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !) |
ff37b1712fa5
tests: conditonalize a difference in test-merge-tools.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40478
diff
changeset
|
1961 Running merge tool for b (*/bin/echo): (glob) (no-windows !) |
40478
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1962 - local (working copy): 10:2d1f533d add binary file (#2) tip default |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1963 - base (base): -1:00000000 default |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1964 - other (merge rev): 9:1e7ad7d7 add binary file (#1) default |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1965 merge runs here ... |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1966 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1967 (branch merge, don't forget to commit) |
86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
Kyle Lippincott <spectral@google.com>
parents:
40465
diff
changeset
|
1968 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1969 Check that debugpicktool examines which merge tool is chosen for |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1970 specified file as expected |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1971 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1972 $ beforemerge |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1973 [merge-tools] |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1974 false.whatever= |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1975 true.priority=1 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1976 true.executable=cat |
38951
6bfd1054d867
tests: demonstrate that no requested merge tool is ignored if missing
Martin von Zweigbergk <martinvonz@google.com>
parents:
38041
diff
changeset
|
1977 missingbinary.executable=doesnotexist |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1978 # hg update -C 1 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1979 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1980 (default behavior: checking files in the working parent context) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1981 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1982 $ hg manifest |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1983 f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1984 $ hg debugpickmergetool |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1985 f = true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1986 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1987 (-X/-I and file patterns limmit examination targets) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1988 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1989 $ hg debugpickmergetool -X f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1990 $ hg debugpickmergetool unknown |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1991 unknown: no such file in rev ef83787e2614 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1992 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1993 (--changedelete emulates merging change and delete) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1994 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1995 $ hg debugpickmergetool --changedelete |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1996 f = :prompt |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1997 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1998 (-r REV causes checking files in specified revision) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
1999 |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
2000 $ hg manifest -r 8 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2001 f.txt |
39124
6618634e3325
filemerge: show warning if chosen tool has no binary files capability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
38952
diff
changeset
|
2002 $ hg debugpickmergetool -r 8 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2003 f.txt = true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2004 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2005 #if symlink |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2006 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2007 (symlink causes chosing :prompt) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2008 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2009 $ hg debugpickmergetool -r 6d00b3726f6e |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2010 f = :prompt |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2011 |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2012 (by default, it is assumed that no internal merge tools has symlinks |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2013 capability) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2014 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2015 $ hg debugpickmergetool \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2016 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2017 > --config merge-tools.:merge-other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2018 > --config merge-patterns.f=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2019 > --config merge-patterns.re:[f]=:merge-local \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2020 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2021 f = :prompt |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2022 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2023 $ hg debugpickmergetool \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2024 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2025 > --config merge-tools.:other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2026 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2027 f = :prompt |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2028 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2029 (with strict-capability-check=true, actual symlink capabilities are |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2030 checked striclty) |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2031 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2032 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2033 > -r 6d00b3726f6e \ |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2034 > --config merge-tools.:merge-other.symlink=true \ |
39125
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2035 > --config merge-patterns.f=:merge-other \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2036 > --config merge-patterns.re:[f]=:merge-local \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2037 > --config merge-patterns.re:[a-z]=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2038 f = :other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2039 |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2040 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2041 > -r 6d00b3726f6e \ |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2042 > --config ui.merge=:other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2043 f = :other |
cded904f7acc
filemerge: add config knob to check capabilities of internal merge tools
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39124
diff
changeset
|
2044 |
39266
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2045 $ hg debugpickmergetool --config merge.strict-capability-check=true \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2046 > -r 6d00b3726f6e \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2047 > --config merge-tools.:merge-other.symlink=true \ |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2048 > --config ui.merge=:merge-other |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2049 f = :prompt |
82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
39183
diff
changeset
|
2050 |
32256
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2051 #endif |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2052 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2053 (--verbose shows some configurations) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2054 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2055 $ hg debugpickmergetool --tool foobar -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2056 with --tool 'foobar' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2057 f = foobar |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2058 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2059 $ HGMERGE=false hg debugpickmergetool -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2060 with HGMERGE='false' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2061 f = false |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2062 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2063 $ hg debugpickmergetool --config ui.merge=false -v |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2064 with ui.merge='false' |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2065 f = false |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2066 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2067 (--debug shows errors detected intermediately) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2068 |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2069 $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2070 couldn't find merge tool true (for pattern f) |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2071 couldn't find merge tool true |
9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32255
diff
changeset
|
2072 f = false |
38029
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
2073 |
a4a5c3085ea9
test-merge-tools: create repo directory to free $TESTTMP for temporary files
Yuya Nishihara <yuya@tcha.org>
parents:
37077
diff
changeset
|
2074 $ cd .. |