1396 move:[33] add uu |
1396 move:[33] add uu |
1397 atop:[35] _pp |
1397 atop:[35] _pp |
1398 working directory is now at 43c3f5ef149f |
1398 working directory is now at 43c3f5ef149f |
1399 |
1399 |
1400 |
1400 |
|
1401 Check that dirstate changes are kept at failure for conflicts (issue4966) |
|
1402 ---------------------------------------- |
|
1403 |
|
1404 $ echo "will be amended" > newfile |
|
1405 $ hg commit -m "will be amended" |
|
1406 $ hg parents |
|
1407 37 : will be amended - test |
|
1408 |
|
1409 $ echo "will be evolved safely" >> a |
|
1410 $ hg commit -m "will be evolved safely" |
|
1411 |
|
1412 $ echo "will cause conflict at evolve" > newfile |
|
1413 $ echo "newly added" > newlyadded |
|
1414 $ hg add newlyadded |
|
1415 $ hg commit -m "will cause conflict at evolve" |
|
1416 |
|
1417 $ hg update -q 37 |
|
1418 $ echo "amended" > newfile |
|
1419 $ hg amend -m "amended" |
|
1420 2 new unstable changesets |
|
1421 |
|
1422 $ hg evolve --rev "37::" |
|
1423 move:[38] will be evolved safely |
|
1424 atop:[41] amended |
|
1425 move:[39] will cause conflict at evolve |
|
1426 atop:[42] will be evolved safely |
|
1427 merging newfile |
|
1428 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
|
1429 evolve failed! |
|
1430 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
|
1431 abort: unresolved merge conflicts (see hg help resolve) |
|
1432 [255] |
|
1433 |
|
1434 $ glog -r "36::" --hidden |
|
1435 @ 42:c904da5245b0@default(draft) will be evolved safely |
|
1436 | |
|
1437 o 41:34ae045ec400@default(draft) amended |
|
1438 | |
|
1439 | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 |
|
1440 | | |
|
1441 | | o 39:02e943732647@default(draft) will cause conflict at evolve |
|
1442 | | | |
|
1443 | | x 38:f8e30e9317aa@default(draft) will be evolved safely |
|
1444 | |/ |
|
1445 | x 37:36030b147271@default(draft) will be amended |
|
1446 |/ |
|
1447 o 36:43c3f5ef149f@default(draft) add uu |
|
1448 | |
|
1449 |
|
1450 $ hg status newlyadded |
|
1451 A newlyadded |