Mercurial > hg
annotate tests/test-merge-tools.out @ 12152:e59156a1316f
merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 02 Sep 2010 17:28:20 +0200 |
| parents | c52057614c72 |
| children | f2daa6ab514a |
| rev | line source |
|---|---|
| 7731 | 1 # revision 0 |
| 2 adding f | |
| 3 # revision 1 | |
| 4 # revision 2 | |
| 5 created new head | |
| 6 # revision 3 - simple to merge | |
| 7 created new head | |
| 8 | |
| 9 | |
| 10 Tool selection | |
| 11 | |
| 12 # default is internal merge: | |
| 13 [merge-tools] | |
| 14 # hg update -C 1 | |
| 15 # hg merge -r 2 | |
| 16 merging f | |
| 17 warning: conflicts during merge. | |
| 18 merging f failed! | |
| 19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
20 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 21 # cat f |
| 22 <<<<<<< local | |
| 23 revision 1 | |
| 24 ======= | |
| 25 revision 2 | |
| 26 >>>>>>> other | |
| 27 space | |
| 28 # hg stat | |
| 29 M f | |
| 30 ? f.orig | |
| 31 | |
| 32 # simplest hgrc using false for merge: | |
| 33 [merge-tools] | |
| 34 false.whatever= | |
| 35 # hg update -C 1 | |
| 36 # hg merge -r 2 | |
| 37 merging f | |
| 38 merging f failed! | |
| 39 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
40 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 41 # cat f |
| 42 revision 1 | |
| 43 space | |
| 44 # hg stat | |
| 45 M f | |
| 46 ? f.orig | |
| 47 | |
| 48 # true with higher .priority gets precedence: | |
| 49 [merge-tools] | |
| 50 false.whatever= | |
| 51 true.priority=1 | |
| 52 # hg update -C 1 | |
| 53 # hg merge -r 2 | |
| 54 merging f | |
| 55 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 56 (branch merge, don't forget to commit) | |
| 57 # cat f | |
| 58 revision 1 | |
| 59 space | |
| 60 # hg stat | |
| 61 M f | |
| 62 | |
| 63 # unless lowered on command line: | |
| 64 [merge-tools] | |
| 65 false.whatever= | |
| 66 true.priority=1 | |
| 67 # hg update -C 1 | |
| 68 # hg merge -r 2 --config merge-tools.true.priority=-7 | |
| 69 merging f | |
| 70 merging f failed! | |
| 71 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
72 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 73 # cat f |
| 74 revision 1 | |
| 75 space | |
| 76 # hg stat | |
| 77 M f | |
| 78 ? f.orig | |
| 79 | |
| 80 # or false set higher on command line: | |
| 81 [merge-tools] | |
| 82 false.whatever= | |
| 83 true.priority=1 | |
| 84 # hg update -C 1 | |
| 85 # hg merge -r 2 --config merge-tools.false.priority=117 | |
| 86 merging f | |
| 87 merging f failed! | |
| 88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
89 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 90 # cat f |
| 91 revision 1 | |
| 92 space | |
| 93 # hg stat | |
| 94 M f | |
| 95 ? f.orig | |
| 96 | |
| 97 # or true.executable not found in PATH: | |
| 98 [merge-tools] | |
| 99 false.whatever= | |
| 100 true.priority=1 | |
| 101 # hg update -C 1 | |
| 102 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool | |
| 103 merging f | |
| 104 merging f failed! | |
| 105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
106 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 107 # cat f |
| 108 revision 1 | |
| 109 space | |
| 110 # hg stat | |
| 111 M f | |
| 112 ? f.orig | |
| 113 | |
| 114 # or true.executable with bogus path: | |
| 115 [merge-tools] | |
| 116 false.whatever= | |
| 117 true.priority=1 | |
| 118 # hg update -C 1 | |
|
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
9468
diff
changeset
|
119 # hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool |
| 7731 | 120 merging f |
| 121 merging f failed! | |
| 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
123 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 124 # cat f |
| 125 revision 1 | |
| 126 space | |
| 127 # hg stat | |
| 128 M f | |
| 129 ? f.orig | |
| 130 | |
| 131 # but true.executable set to cat found in PATH works: | |
| 132 [merge-tools] | |
| 133 false.whatever= | |
| 134 true.priority=1 | |
| 135 true.executable=cat | |
| 136 # hg update -C 1 | |
| 137 # hg merge -r 2 | |
| 138 revision 1 | |
| 139 space | |
| 140 revision 0 | |
| 141 space | |
| 142 revision 2 | |
| 143 space | |
| 144 merging f | |
| 145 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 146 (branch merge, don't forget to commit) | |
| 147 # cat f | |
| 148 revision 1 | |
| 149 space | |
| 150 # hg stat | |
| 151 M f | |
| 152 | |
| 153 # and true.executable set to cat with path works: | |
| 154 [merge-tools] | |
| 155 false.whatever= | |
| 156 true.priority=1 | |
| 157 true.executable=cat | |
| 158 # hg update -C 1 | |
|
8539
9a4fe59b1eca
test-merge-tools: windows fixes
Patrick Mezard <pmezard@gmail.com>
parents:
7859
diff
changeset
|
159 # hg merge -r 2 --config merge-tools.true.executable=cat |
| 7731 | 160 revision 1 |
| 161 space | |
| 162 revision 0 | |
| 163 space | |
| 164 revision 2 | |
| 165 space | |
| 166 merging f | |
| 167 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 168 (branch merge, don't forget to commit) | |
| 169 # cat f | |
| 170 revision 1 | |
| 171 space | |
| 172 # hg stat | |
| 173 M f | |
| 174 | |
| 175 | |
| 176 Tool selection and merge-patterns | |
| 177 | |
|
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
178 # merge-patterns specifies new tool false: |
| 7731 | 179 [merge-tools] |
| 180 false.whatever= | |
| 181 true.priority=1 | |
| 182 true.executable=cat | |
| 183 # hg update -C 1 | |
|
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
184 # hg merge -r 2 --config merge-patterns.f=false |
| 7731 | 185 merging f |
|
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
186 merging f failed! |
|
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
187 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
188 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 189 # cat f |
| 190 revision 1 | |
| 191 space | |
| 192 # hg stat | |
| 193 M f | |
|
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7732
diff
changeset
|
194 ? f.orig |
| 7731 | 195 |
| 196 # merge-patterns specifies executable not found in PATH and gets warning: | |
| 197 [merge-tools] | |
| 198 false.whatever= | |
| 199 true.priority=1 | |
| 200 true.executable=cat | |
| 201 # hg update -C 1 | |
| 202 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | |
| 203 couldn't find merge tool true specified for f | |
| 204 merging f | |
| 205 merging f failed! | |
| 206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
207 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 208 # cat f |
| 209 revision 1 | |
| 210 space | |
| 211 # hg stat | |
| 212 M f | |
| 213 ? f.orig | |
| 214 | |
| 215 # merge-patterns specifies executable with bogus path and gets warning: | |
| 216 [merge-tools] | |
| 217 false.whatever= | |
| 218 true.priority=1 | |
| 219 true.executable=cat | |
| 220 # hg update -C 1 | |
|
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
9468
diff
changeset
|
221 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool |
|
7732
3793802ea41b
Make util.find_exe alway returns existing file, fixing issue1459
Mads Kiilerich <mads@kiilerich.com>
parents:
7731
diff
changeset
|
222 couldn't find merge tool true specified for f |
| 7731 | 223 merging f |
| 224 merging f failed! | |
| 225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
226 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 227 # cat f |
| 228 revision 1 | |
| 229 space | |
| 230 # hg stat | |
| 231 M f | |
| 232 ? f.orig | |
| 233 | |
| 234 | |
|
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
235 ui.merge overrules priority |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
236 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
237 # ui.merge specifies false: |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
238 [merge-tools] |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
239 false.whatever= |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
240 true.priority=1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
241 true.executable=cat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
242 # hg update -C 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
243 # hg merge -r 2 --config ui.merge=false |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
244 merging f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
245 merging f failed! |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
246 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
247 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
248 # cat f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
249 revision 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
250 space |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
251 # hg stat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
252 M f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
253 ? f.orig |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
254 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
255 # ui.merge specifies internal:fail: |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
256 [merge-tools] |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
257 false.whatever= |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
258 true.priority=1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
259 true.executable=cat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
260 # hg update -C 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
261 # hg merge -r 2 --config ui.merge=internal:fail |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
262 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
263 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
264 # cat f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
265 revision 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
266 space |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
267 # hg stat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
268 M f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
269 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
270 # ui.merge specifies internal:local: |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
271 [merge-tools] |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
272 false.whatever= |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
273 true.priority=1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
274 true.executable=cat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
275 # hg update -C 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
276 # hg merge -r 2 --config ui.merge=internal:local |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
277 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
278 (branch merge, don't forget to commit) |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
279 # cat f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
280 revision 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
281 space |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
282 # hg stat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
283 M f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
284 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
285 # ui.merge specifies internal:other: |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
286 [merge-tools] |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
287 false.whatever= |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
288 true.priority=1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
289 true.executable=cat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
290 # hg update -C 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
291 # hg merge -r 2 --config ui.merge=internal:other |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
292 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
293 (branch merge, don't forget to commit) |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
294 # cat f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
295 revision 2 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
296 space |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
297 # hg stat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
298 M f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
299 |
|
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
300 # ui.merge specifies internal:prompt: |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
301 [merge-tools] |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
302 false.whatever= |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
303 true.priority=1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
304 true.executable=cat |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
305 # hg update -C 1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
306 # hg merge -r 2 --config ui.merge=internal:prompt |
|
8940
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
8901
diff
changeset
|
307 no tool found to merge f |
|
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
8901
diff
changeset
|
308 keep (l)ocal or take (o)ther? l |
|
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
309 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
310 (branch merge, don't forget to commit) |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
311 # cat f |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
312 revision 1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
313 space |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
314 # hg stat |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
315 M f |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
316 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
317 # ui.merge specifies internal:dump: |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
318 [merge-tools] |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
319 false.whatever= |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
320 true.priority=1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
321 true.executable=cat |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
322 # hg update -C 1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
323 # hg merge -r 2 --config ui.merge=internal:dump |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
324 merging f |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
325 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
326 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
8901
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
327 # cat f |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
328 revision 1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
329 space |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
330 # hg stat |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
331 M f |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
332 ? f.base |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
333 ? f.local |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
334 ? f.orig |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
335 ? f.other |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
336 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
337 f.base: |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
338 revision 0 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
339 space |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
340 f.local: |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
341 revision 1 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
342 space |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
343 f.other: |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
344 revision 2 |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
345 space |
|
94319ae527cf
test merge-tools internal:dump and internal:prompt
Mads Kiilerich <mads@kiilerich.com>
parents:
8539
diff
changeset
|
346 |
|
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
347 # ui.merge specifies internal:other but is overruled by pattern for false: |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
348 [merge-tools] |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
349 false.whatever= |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
350 true.priority=1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
351 true.executable=cat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
352 # hg update -C 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
353 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
354 merging f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
355 merging f failed! |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
356 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
357 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
7846
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
358 # cat f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
359 revision 1 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
360 space |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
361 # hg stat |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
362 M f |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
363 ? f.orig |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
364 |
|
1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
Mads Kiilerich <mads@kiilerich.com>
parents:
7821
diff
changeset
|
365 |
| 7731 | 366 Premerge |
| 367 | |
| 368 # Default is silent simplemerge: | |
| 369 [merge-tools] | |
| 370 false.whatever= | |
| 371 true.priority=1 | |
| 372 true.executable=cat | |
| 373 # hg update -C 1 | |
| 374 # hg merge -r 3 | |
| 375 merging f | |
| 376 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 377 (branch merge, don't forget to commit) | |
| 378 # cat f | |
| 379 revision 1 | |
| 380 space | |
| 381 revision 3 | |
| 382 # hg stat | |
| 383 M f | |
| 384 | |
| 385 # .premerge=True is same: | |
| 386 [merge-tools] | |
| 387 false.whatever= | |
| 388 true.priority=1 | |
| 389 true.executable=cat | |
| 390 # hg update -C 1 | |
| 391 # hg merge -r 3 --config merge-tools.true.premerge=True | |
| 392 merging f | |
| 393 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 394 (branch merge, don't forget to commit) | |
| 395 # cat f | |
| 396 revision 1 | |
| 397 space | |
| 398 revision 3 | |
| 399 # hg stat | |
| 400 M f | |
| 401 | |
| 402 # .premerge=False executes merge-tool: | |
| 403 [merge-tools] | |
| 404 false.whatever= | |
| 405 true.priority=1 | |
| 406 true.executable=cat | |
| 407 # hg update -C 1 | |
| 408 # hg merge -r 3 --config merge-tools.true.premerge=False | |
| 409 revision 1 | |
| 410 space | |
| 411 revision 0 | |
| 412 space | |
| 413 revision 0 | |
| 414 space | |
| 415 revision 3 | |
| 416 merging f | |
| 417 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 418 (branch merge, don't forget to commit) | |
| 419 # cat f | |
| 420 revision 1 | |
| 421 space | |
| 422 # hg stat | |
| 423 M f | |
| 424 | |
| 425 | |
| 426 Tool execution | |
| 427 | |
| 428 # set tools.args explicit to include $base $local $other $output: | |
| 429 [merge-tools] | |
| 430 false.whatever= | |
| 431 true.priority=1 | |
| 432 true.executable=cat | |
| 433 # hg update -C 1 | |
| 434 ==> ... <== | |
| 435 revision 0 | |
| 436 space | |
| 437 | |
| 438 ==> ... <== | |
| 439 revision 1 | |
| 440 space | |
| 441 | |
| 442 ==> ... <== | |
| 443 revision 2 | |
| 444 space | |
| 445 | |
| 446 ==> ... <== | |
| 447 revision 1 | |
| 448 space | |
| 449 merging f | |
| 450 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 451 (branch merge, don't forget to commit) | |
| 452 # cat f | |
| 453 revision 1 | |
| 454 space | |
| 455 # hg stat | |
| 456 M f | |
| 457 | |
| 458 # Merge with "echo mergeresult > $local": | |
| 459 [merge-tools] | |
| 460 false.whatever= | |
| 461 true.priority=1 | |
| 462 true.executable=cat | |
| 463 # hg update -C 1 | |
| 464 merging f | |
| 465 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 466 (branch merge, don't forget to commit) | |
| 467 # cat f | |
| 468 mergeresult | |
| 469 # hg stat | |
| 470 M f | |
| 471 | |
| 472 # - and $local is the file f: | |
| 473 [merge-tools] | |
| 474 false.whatever= | |
| 475 true.priority=1 | |
| 476 true.executable=cat | |
| 477 # hg update -C 1 | |
| 478 merging f | |
| 479 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 480 (branch merge, don't forget to commit) | |
| 481 # cat f | |
| 482 mergeresult | |
| 483 # hg stat | |
| 484 M f | |
| 485 | |
| 486 # Merge with "echo mergeresult > $output" - the variable is a bit magic: | |
| 487 [merge-tools] | |
| 488 false.whatever= | |
| 489 true.priority=1 | |
| 490 true.executable=cat | |
| 491 # hg update -C 1 | |
| 492 merging f | |
| 493 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 494 (branch merge, don't forget to commit) | |
| 495 # cat f | |
| 496 mergeresult | |
| 497 # hg stat | |
| 498 M f | |
| 499 | |
|
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
500 # Merge using tool with a path that must be quoted: |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
501 [merge-tools] |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
502 false.whatever= |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
503 true.priority=1 |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
504 true.executable=cat |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
505 # hg update -C 1 |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
506 merging f |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
507 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
508 (branch merge, don't forget to commit) |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
509 # cat f |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
510 revision 0 |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
511 space |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
512 revision 1 |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
513 space |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
514 revision 2 |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
515 space |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
516 # hg stat |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
517 M f |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10282
diff
changeset
|
518 |
| 7731 | 519 |
| 520 Merge post-processing | |
| 521 | |
| 522 # cat is a bad merge-tool and doesn't change: | |
| 523 [merge-tools] | |
| 524 false.whatever= | |
| 525 true.priority=1 | |
| 526 true.executable=cat | |
| 527 # hg update -C 1 | |
|
8539
9a4fe59b1eca
test-merge-tools: windows fixes
Patrick Mezard <pmezard@gmail.com>
parents:
7859
diff
changeset
|
528 # hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
| 7731 | 529 revision 1 |
| 530 space | |
| 531 revision 0 | |
| 532 space | |
| 533 revision 2 | |
| 534 space | |
| 535 merging f | |
|
8940
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
8901
diff
changeset
|
536 output file f appears unchanged |
|
01ada7b1861d
ui.prompt: Show prompt and selection in non-interactive mode
Mads Kiilerich <mads@kiilerich.com>
parents:
8901
diff
changeset
|
537 was merge successful (yn)? n |
| 7731 | 538 merging f failed! |
| 539 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8940
diff
changeset
|
540 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7731 | 541 # cat f |
| 542 revision 1 | |
| 543 space | |
| 544 # hg stat | |
| 545 M f | |
| 546 ? f.orig | |
| 547 |