evolve: continue conflicted relocation content-divergence
This patch adds logic to continue an conflicted content-divergence resolution
which was interrupted while relocating one of the divergent commits.
The tests shows the there is some mishandling of copies internally which will be
fixed in next patch.
#require test-repo
$ checkcm() {
> if ! (which check-manifest > /dev/null); then
> echo skipped: missing tool: check-manifest;
> exit 80;
> fi;
> };
$ checkcm
$ cat << EOF >> $HGRCPATH
> [experimental]
> evolution=all
> EOF
Run check manifest:
$ cd $TESTDIR/..
$ check-manifest
lists of files in version control and sdist match