equal
deleted
inserted
replaced
1448 |
1448 |
1449 x 0:f7ad41964313 added a () |
1449 x 0:f7ad41964313 added a () |
1450 |
1450 |
1451 $ cd .. |
1451 $ cd .. |
1452 |
1452 |
1453 Test which shows that orphanmerge evolution can result to crash because of |
1453 Test to make sure that `lastsolved` always has correct value and things don't break: |
1454 lastsolved not being updated in case of orphanmerge: |
1454 ------------------------------------------------------------------------------------ |
1455 (It will be fixed in next patch) |
1455 (before we were not updating it in case of orphan merge) |
1456 |
1456 |
1457 Prepare the repo: |
1457 Prepare the repo: |
1458 $ hg init orphanmergerepo |
1458 $ hg init orphanmergerepo |
1459 $ cd orphanmergerepo |
1459 $ cd orphanmergerepo |
1460 $ echo a > a |
1460 $ echo a > a |