view tests/testlib/common.sh @ 3805:2410e7063692

evolve: implement resolution of content-divergence when on differet parents

This patch implements the basic version of resolution of content-divergence
changesets when they are on different parents but one of the parent is gca of
both the different parents.

The functionality first relocates the divergent changeset which was left behind
and then resolves the content-divergence like it resolves in normal cases.

This is a very basic implementation because it still does not work on
interrupted evolution. Test changes in this patch shows the basic functionality
working. The output of dry-run is also required to be tweaked in such cased.

Upcoming patches will add more tests and will improve the implementation to work
during conflicts too.

. $TESTDIR/testlib/pythonpath.sh

mkcommit() {
   echo "$1" > "$1"
   hg add "$1"
   hg ci -m "$1"
}

getid() {
   hg log --hidden --template '{node}\n' --rev "$1"
}

cat >> $HGRCPATH <<EOF
[alias]
debugobsolete=debugobsolete -d '0 0'
EOF