Mercurial > hg
annotate tests/test-merge-tools.t @ 15718:c604a3d1969d
icasefs: disuse length check against un-normcase()-ed filenames
this patch disuses length check against un-normcase()-ed filenames
gotten by "os.listdir()", because there is no assurance that
filesystem stores filenames normalized except in letter case, even
though some case insensitive filesystems (in some environment, for
some language setting) store them in such manner.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 24 Dec 2011 00:50:56 +0900 |
parents | 2607de602105 |
children | cdbb53a640c1 |
rev | line source |
---|---|
15519
bb9ad375b51c
tests: add 'hghave system-sh' to skip tests on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15264
diff
changeset
|
1 $ "$TESTDIR/hghave" system-sh || exit 80 |
bb9ad375b51c
tests: add 'hghave system-sh' to skip tests on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15264
diff
changeset
|
2 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
3 test merge-tools configuration - mostly exercising filemerge.py |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
4 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
5 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
6 $ hg init |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
7 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
8 revision 0 |
7731 | 9 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
10 $ echo "revision 0" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
11 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
12 $ hg commit -Am "revision 0" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
13 adding f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
14 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
15 revision 1 |
7731 | 16 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
17 $ echo "revision 1" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
18 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
19 $ hg commit -Am "revision 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
20 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
21 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
22 revision 2 |
7731 | 23 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
24 $ echo "revision 2" > f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
25 $ echo "space" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
26 $ hg commit -Am "revision 2" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
27 created new head |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
28 $ hg update 0 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
29 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
30 revision 3 - simple to merge |
7731 | 31 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
32 $ echo "revision 3" >> f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
33 $ hg commit -Am "revision 3" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
34 created new head |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
35 $ 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
|
36 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
37 $ beforemerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
38 > cat .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
39 > echo "# hg update -C 1" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
40 > hg update -C 1 > /dev/null |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
41 > } |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
42 $ aftermerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
43 > echo "# cat f" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
44 > cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
45 > echo "# hg stat" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
46 > hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
47 > rm -f f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
48 > } |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
49 $ domerge() { |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
50 > beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
51 > echo "# hg merge $*" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
52 > hg merge $* |
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 > } |
7731 | 55 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
56 Tool selection |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
58 default is internal merge: |
7731 | 59 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
60 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
61 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
62 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
63 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
64 hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
65 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
|
66 running from a devel copy, not a temp installation |
7731 | 67 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
68 $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
69 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
70 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15264
diff
changeset
|
71 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
73 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
74 [1] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
75 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
76 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
77 <<<<<<< local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
78 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
79 ======= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
80 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
81 >>>>>>> other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
82 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
83 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
84 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
85 ? f.orig |
7731 | 86 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
87 simplest hgrc using false for merge: |
7731 | 88 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
89 $ echo "false.whatever=" >> .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
90 $ domerge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
91 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
92 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
93 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
94 # hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
95 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
96 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
97 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
98 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
99 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
100 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
101 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
102 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
103 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
104 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
105 |
15545
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
106 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
|
107 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
108 $ touch false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
109 $ hg up -qC 1 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
110 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
111 merging f |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
112 warning: conflicts during merge. |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
113 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
114 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
115 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
116 [1] |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
117 $ rm false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
118 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
119 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
|
120 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
121 $ mkdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
122 $ hg up -qC 1 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
123 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
124 merging f |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
125 warning: conflicts during merge. |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
126 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
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 |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
128 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
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 $ rmdir false |
2607de602105
tests: test findexe() access check fixed in 58f96703a9ab
Mads Kiilerich <mads@kiilerich.com>
parents:
15524
diff
changeset
|
131 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
132 true with higher .priority gets precedence: |
7731 | 133 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
134 $ echo "true.priority=1" >> .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
135 $ domerge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
136 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
137 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
138 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
139 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
140 # hg merge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
141 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
142 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
|
143 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
144 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
145 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
146 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
147 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
148 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
149 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
150 unless lowered on command line: |
7731 | 151 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
152 $ domerge -r 2 --config merge-tools.true.priority=-7 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
153 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
154 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
155 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
156 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
157 # hg merge -r 2 --config merge-tools.true.priority=-7 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
158 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
159 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
160 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
161 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
162 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
163 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
164 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
165 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
166 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
167 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
168 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
169 or false set higher on command line: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
170 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
171 $ domerge -r 2 --config merge-tools.false.priority=117 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
172 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
173 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
174 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
175 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
176 # hg merge -r 2 --config merge-tools.false.priority=117 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
177 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
178 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
180 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
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 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
187 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
188 or true.executable not found in PATH: |
7731 | 189 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
190 $ domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
191 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
192 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
193 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
194 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
195 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
196 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
197 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
198 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
199 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
200 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
201 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
202 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
203 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
204 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
205 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
206 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
207 or true.executable with bogus path: |
7731 | 208 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
209 $ domerge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
210 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
211 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
212 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
213 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
214 # hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
215 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
216 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
217 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
218 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
219 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
220 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
221 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
222 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
223 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
224 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
225 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
226 but true.executable set to cat found in PATH works: |
7731 | 227 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
228 $ echo "true.executable=cat" >> .hg/hgrc |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
229 $ domerge -r 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
230 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
231 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
232 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
233 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
234 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
235 # hg merge -r 2 |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
236 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
237 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
238 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
239 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
240 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
241 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
242 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
243 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
|
244 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
245 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
246 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
247 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
248 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
249 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
250 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
251 and true.executable set to cat with path works: |
7731 | 252 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
253 $ domerge -r 2 --config merge-tools.true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
254 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
255 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
256 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
257 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
258 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
259 # 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
|
260 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
261 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
262 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
263 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
264 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
265 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
266 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
267 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
|
268 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
269 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
270 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
271 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
272 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
273 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
274 |
15264
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
275 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
|
276 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
277 $ cat > $HGTMP/merge.sh <<EOF |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
278 > #!/bin/sh |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
279 > echo 'custom merge tool' |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
280 > EOF |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
281 $ chmod +x $HGTMP/merge.sh |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
282 $ domerge -r 2 --config merge-tools.true.executable='$HGTMP/merge.sh' |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
283 [merge-tools] |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
284 false.whatever= |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
285 true.priority=1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
286 true.executable=cat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
287 # hg update -C 1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
288 # hg merge -r 2 --config merge-tools.true.executable=$HGTMP/merge.sh |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
289 merging f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
290 custom merge tool |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
291 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
|
292 (branch merge, don't forget to commit) |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
293 # cat f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
294 revision 1 |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
295 space |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
296 # hg stat |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
297 M f |
157d93c41c10
merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca>
parents:
15243
diff
changeset
|
298 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
299 Tool selection and merge-patterns |
7731 | 300 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
301 merge-patterns specifies new tool false: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
302 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
303 $ domerge -r 2 --config merge-patterns.f=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
304 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
305 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
306 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
307 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
308 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
309 # hg merge -r 2 --config merge-patterns.f=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
310 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
311 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
312 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
313 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
314 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
315 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
316 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
317 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
318 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
319 ? f.orig |
7731 | 320 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
321 merge-patterns specifies executable not found in PATH and gets warning: |
7731 | 322 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
323 $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
324 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
325 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
326 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
327 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
328 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
329 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
330 couldn't find merge tool true specified for f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
331 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
332 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
333 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
334 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
335 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
336 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
337 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
338 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
339 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
340 ? f.orig |
7731 | 341 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
342 merge-patterns specifies executable with bogus path and gets warning: |
7731 | 343 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
344 $ domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
345 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
346 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
347 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
348 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
349 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
350 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
351 couldn't find merge tool true specified for f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
352 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
353 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
354 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
355 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
356 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
357 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
358 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
359 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
360 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
361 ? f.orig |
7731 | 362 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
363 ui.merge overrules priority |
7731 | 364 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
365 ui.merge specifies false: |
7731 | 366 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
367 $ domerge -r 2 --config ui.merge=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
368 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
369 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
370 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
371 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
372 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
373 # hg merge -r 2 --config ui.merge=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
374 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
375 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
376 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
377 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
378 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
379 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
380 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
381 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
382 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
383 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
384 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
385 ui.merge specifies internal:fail: |
7731 | 386 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
387 $ domerge -r 2 --config ui.merge=internal:fail |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
388 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
389 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
390 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
391 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
392 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
393 # hg merge -r 2 --config ui.merge=internal:fail |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
394 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
395 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
396 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
397 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
398 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
399 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
400 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
401 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
402 ui.merge specifies internal:local: |
7731 | 403 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
404 $ domerge -r 2 --config ui.merge=internal:local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
405 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
406 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
407 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
408 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
409 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
410 # hg merge -r 2 --config ui.merge=internal:local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
411 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
|
412 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
413 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
414 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
415 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
416 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
417 M f |
7731 | 418 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
419 ui.merge specifies internal:other: |
7731 | 420 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
421 $ domerge -r 2 --config ui.merge=internal:other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
422 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
423 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
424 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
425 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
426 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
427 # hg merge -r 2 --config ui.merge=internal:other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
428 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
|
429 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
430 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
431 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
432 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
433 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
434 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
435 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
436 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
|
437 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
438 $ domerge -r 2 --config ui.merge=internal:prompt |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
439 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
440 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
441 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
442 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
443 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
444 # hg merge -r 2 --config ui.merge=internal:prompt |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
445 no tool found to merge f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
446 keep (l)ocal or take (o)ther? l |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
447 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
|
448 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
449 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
450 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
451 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
452 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
453 M f |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
454 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
455 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
|
456 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
457 $ domerge -r 2 --config ui.merge=internal:dump |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
458 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
459 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
460 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
461 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
462 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
463 # hg merge -r 2 --config ui.merge=internal:dump |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
464 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
465 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
466 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
467 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
468 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
469 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
470 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
471 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
472 ? f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
473 ? f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
474 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
475 ? f.other |
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7785
diff
changeset
|
476 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
477 f.base: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
478 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
479 $ cat f.base |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
480 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
481 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
482 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
483 f.local: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
484 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
485 $ cat f.local |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
486 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
487 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
488 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
489 f.other: |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
490 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
491 $ cat f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
492 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
493 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
494 $ rm f.base f.local f.other |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
495 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
496 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
|
497 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
498 $ domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
499 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
500 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
501 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
502 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
503 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
504 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
505 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
506 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
507 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
508 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
509 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
510 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
511 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
512 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
513 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
514 ? f.orig |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
515 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
516 Premerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
517 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
518 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
|
519 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
520 $ domerge -r 2 --config ui.merge=internal:other --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
521 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
522 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
523 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
524 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
525 # hg update -C 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
526 # hg merge -r 2 --config ui.merge=internal:other --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
527 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
528 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
529 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
530 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
531 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
532 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
533 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
534 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
535 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
536 ? f.orig |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
537 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
538 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
|
539 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
540 $ HGMERGE=internal:other ; export HGMERGE |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
541 $ domerge -r 2 --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
542 [merge-tools] |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
543 false.whatever= |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
544 true.priority=1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
545 true.executable=cat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
546 # hg update -C 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
547 # hg merge -r 2 --tool=false |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
548 merging f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
549 merging f failed! |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
550 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
551 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
552 # cat f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
553 revision 1 |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
554 space |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
555 # hg stat |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
556 M f |
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
557 ? f.orig |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
558 |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12460
diff
changeset
|
559 $ 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
|
560 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
561 Default is silent simplemerge: |
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8674
diff
changeset
|
562 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
563 $ domerge -r 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
564 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
565 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
566 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
567 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
568 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
569 # hg merge -r 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
570 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
571 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
|
572 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
573 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
574 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
575 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
576 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
577 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
578 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
579 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
580 .premerge=True is same: |
7731 | 581 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
582 $ domerge -r 3 --config merge-tools.true.premerge=True |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
583 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
584 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
585 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
586 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
587 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
588 # hg merge -r 3 --config merge-tools.true.premerge=True |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
589 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
590 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
|
591 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
592 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
593 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
594 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
595 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
596 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
597 M f |
7731 | 598 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
599 .premerge=False executes merge-tool: |
7731 | 600 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
601 $ domerge -r 3 --config merge-tools.true.premerge=False |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
602 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
603 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
604 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
605 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
606 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
607 # 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
|
608 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
609 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
610 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
611 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
612 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
613 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
614 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
615 revision 3 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
616 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
|
617 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
618 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
619 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
620 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
621 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
622 M f |
7731 | 623 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
624 Tool execution |
7731 | 625 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
626 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
|
627 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
628 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
629 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
630 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
631 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
632 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
633 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
634 $ 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
|
635 > | sed 's,==> .* <==,==> ... <==,g' |
13439
d724a69309e0
util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents:
12788
diff
changeset
|
636 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
637 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
638 revision 0 |
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 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
641 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
642 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
643 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
644 |
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 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
647 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
648 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
649 ==> ... <== |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
650 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
651 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
652 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
|
653 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
654 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
655 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
656 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
657 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
658 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
659 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
660 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
661 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
|
662 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
663 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
664 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
665 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
666 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
667 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
668 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
669 $ 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
|
670 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
671 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
|
672 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
673 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
674 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
675 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
676 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
677 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
678 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
679 - 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
|
680 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
681 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
682 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
683 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
684 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
685 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
686 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
687 $ 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
|
688 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
689 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
|
690 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
691 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
692 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
693 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
694 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
695 M f |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
696 |
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
13439
diff
changeset
|
697 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
|
698 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
699 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
700 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
701 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
702 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
703 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
704 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
705 $ 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
|
706 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
707 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
|
708 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
709 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
710 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
711 mergeresult |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
712 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
713 M f |
7731 | 714 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
715 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
|
716 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
717 $ beforemerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
718 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
719 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
720 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
721 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
722 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
723 $ cat <<EOF > 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
724 > #!/bin/sh |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
725 > cat "\$1" "\$2" "\$3" > "\$4" |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
726 > EOF |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
727 $ chmod +x 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
728 $ hg merge -r 2 --config merge-tools.true.executable='./my merge tool' --config merge-tools.true.args='$base $local $other $output' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
729 merging f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
730 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
|
731 (branch merge, don't forget to commit) |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
732 $ rm -f 'my merge tool' |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
733 $ aftermerge |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
734 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
735 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
736 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
737 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
738 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
739 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
740 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
741 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
742 M f |
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
743 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
744 Merge post-processing |
7731 | 745 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
746 cat is a bad merge-tool and doesn't change: |
7731 | 747 |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
748 $ domerge -y -r 2 --config merge-tools.true.checkchanged=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
749 [merge-tools] |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
750 false.whatever= |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
751 true.priority=1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
752 true.executable=cat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
753 # hg update -C 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
754 # 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
|
755 merging f |
12460
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
756 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
757 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
758 revision 0 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
759 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
760 revision 2 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
761 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
762 output file f appears unchanged |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
763 was merge successful (yn)? n |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
764 merging f failed! |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
765 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
766 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
767 # cat f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
768 revision 1 |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
769 space |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
770 # hg stat |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
771 M f |
09168638b313
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
772 ? f.orig |