1279 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
1279 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
1280 merging f and f.txt to f.txt |
1280 merging f and f.txt to f.txt |
1281 */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) |
1281 */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) |
1282 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1282 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1283 (branch merge, don't forget to commit) |
1283 (branch merge, don't forget to commit) |
|
1284 |
|
1285 Check that debugpicktool examines which merge tool is chosen for |
|
1286 specified file as expected |
|
1287 |
|
1288 $ beforemerge |
|
1289 [merge-tools] |
|
1290 false.whatever= |
|
1291 true.priority=1 |
|
1292 true.executable=cat |
|
1293 # hg update -C 1 |
|
1294 |
|
1295 (default behavior: checking files in the working parent context) |
|
1296 |
|
1297 $ hg manifest |
|
1298 f |
|
1299 $ hg debugpickmergetool |
|
1300 f = true |
|
1301 |
|
1302 (-X/-I and file patterns limmit examination targets) |
|
1303 |
|
1304 $ hg debugpickmergetool -X f |
|
1305 $ hg debugpickmergetool unknown |
|
1306 unknown: no such file in rev ef83787e2614 |
|
1307 |
|
1308 (--changedelete emulates merging change and delete) |
|
1309 |
|
1310 $ hg debugpickmergetool --changedelete |
|
1311 f = :prompt |
|
1312 |
|
1313 (-r REV causes checking files in specified revision) |
|
1314 |
|
1315 $ hg manifest -r tip |
|
1316 f.txt |
|
1317 $ hg debugpickmergetool -r tip |
|
1318 f.txt = true |
|
1319 |
|
1320 #if symlink |
|
1321 |
|
1322 (symlink causes chosing :prompt) |
|
1323 |
|
1324 $ hg debugpickmergetool -r 6d00b3726f6e |
|
1325 f = :prompt |
|
1326 |
|
1327 #endif |
|
1328 |
|
1329 (--verbose shows some configurations) |
|
1330 |
|
1331 $ hg debugpickmergetool --tool foobar -v |
|
1332 with --tool 'foobar' |
|
1333 f = foobar |
|
1334 |
|
1335 $ HGMERGE=false hg debugpickmergetool -v |
|
1336 with HGMERGE='false' |
|
1337 f = false |
|
1338 |
|
1339 $ hg debugpickmergetool --config ui.merge=false -v |
|
1340 with ui.merge='false' |
|
1341 f = false |
|
1342 |
|
1343 (--debug shows errors detected intermediately) |
|
1344 |
|
1345 $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f |
|
1346 couldn't find merge tool true (for pattern f) |
|
1347 couldn't find merge tool true |
|
1348 f = false |