1400 Check that dirstate changes are kept at failure for conflicts (issue4966)

  1401 ----------------------------------------

  1402 

  1403   $ echo "will be amended" > newfile

  1404   $ hg commit -m "will be amended"

  1405   $ hg parents

  1406   37	: will be amended - test

  1407 

  1408   $ echo "will be evolved safely" >> a

  1409   $ hg commit -m "will be evolved safely"

  1410 

  1411   $ echo "will cause conflict at evolve" > newfile

  1412   $ echo "newly added" > newlyadded

  1413   $ hg add newlyadded

  1414   $ hg commit -m "will cause conflict at evolve"

  1415 

  1416   $ hg update -q 37

  1417   $ echo "amended" > newfile

  1418   $ hg amend -m "amended"

  1419   2 new unstable changesets

  1420 

  1421   $ hg evolve --rev "37::"

  1422   move:[38] will be evolved safely

  1423   atop:[41] amended

  1424   move:[39] will cause conflict at evolve

  1425   atop:[42] will be evolved safely

  1426   merging newfile

  1427   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')

  1428   evolve failed!

  1429   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort

  1430   abort: unresolved merge conflicts (see hg help resolve)

  1431   [255]

  1432 

  1433   $ glog -r "36::" --hidden

  1434   @  42:c904da5245b0@default(draft) will be evolved safely

  1435   |

  1436   o  41:34ae045ec400@default(draft) amended

  1437   |

  1438   | x  40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271

  1439   | |

  1440   | | o  39:02e943732647@default(draft) will cause conflict at evolve

  1441   | | |

  1442   | | x  38:f8e30e9317aa@default(draft) will be evolved safely

  1443   | |/

  1444   | x  37:36030b147271@default(draft) will be amended

  1445   |/

  1446   o  36:43c3f5ef149f@default(draft) add uu

  1447   |

  1448 

  1449   $ hg status newlyadded

  1450   A newlyadded