evolve: create resolved cset on successors of current parents
While resolving content-divergence, sometimes, the parent can be obsolete and
have a successor. We should consider the successors of the parents instead of
obsolete parents as that will do something like orphan+content-divergence
resolution both at the same time which is powerful and results in a single stack
while resolving content-divergence of stacks.
The test changes demonstrates that we can now successfully evolve a content
divergent stack.
#!/bin/bash
. $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
html_output() {
filepath="$1"
touch "$filepath"
shift
python $TESTDIR/testlib/arguments_printer.py 'hg' "$@" > "$filepath"
hg "$@" --color=always 2>&1 | aha -n | tee -a "$filepath"
}
html_raw_output() {
filepath="$1"
touch "$filepath"
shift
# python $TESTDIR/testlib/arguments_printer.py "$@" > "$filepath"
echo "" > "$filepath"
"$@" | tee -a "$filepath"
}
graph() {
hg docgraph --rankdir LR --arrowhead=true --obsarrowhead=true --sphinx-directive --dot-output "$@"
}