docs/figures/hgview-example.png
author Pulkit Goyal <7895pulkit@gmail.com>
Tue, 30 Jan 2018 15:11:35 +0530
changeset 3498 152daa6967af
parent 506 404e926658bc
permissions -rw-r--r--
evolve: add comptability to read old evolvestate files When a user runs `hg evolve` with old evolve where we used to write evolvestate the old ways i.e. without using cbor, and faces conflicts, the evolve is interrupted. If the user updates evolve before completing the evolve, that can result in traceback as the new evolve cannot read the old evolvestate file. The previous patch added function to read old evolvestate file and this patch uses that when we encounter the above mentioned case.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
506
404e926658bc doc: add missing image
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     1
(binary:image/png)