comparison README @ 1597:7876ed4fceb7

evolve: write our own custom evolvestate file Since for ever, we were using 'graftstate' to record the node currently being evolve and allow 'hg evolve --continue' we now move to our on 'evolvestate' file. This remove and issue with 'hg summary' listing interrupted evolve as graft. This also open the way for storing more data into that file and allow proper --abort and --continue of the whole evolve operation (and not just the last one). The whole thing is very hacky but at least there is some progress. Thanks goes to Shusen Liu for initiating this work.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Feb 2016 01:19:14 +0000
parents 6079dcbfb726
children 6482497d859b
comparison
equal deleted inserted replaced
1596:6079dcbfb726 1597:7876ed4fceb7
62 - tests: drop our copy of 'run-tests.py' use core one instead, 62 - tests: drop our copy of 'run-tests.py' use core one instead,
63 - bookmark: do all bookmark movement within a transaction. 63 - bookmark: do all bookmark movement within a transaction.
64 - evolve: compatibility with Mercurial 3.7 64 - evolve: compatibility with Mercurial 3.7
65 - evolve: support merge with a single obsolete parent. 65 - evolve: support merge with a single obsolete parent.
66 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966) 66 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966)
67 - evolve: stop relying on graftstate file for save evolve state
68 (for `hg evolve --continue`)
67 69
68 5.2.2 -- 70 5.2.2 --
69 71
70 - no longer lock the repository for `hg parents` (issue4895) 72 - no longer lock the repository for `hg parents` (issue4895)
71 - updated help for the `evolve` command 73 - updated help for the `evolve` command