view tests/testlib/content-divergence-util.sh @ 6935:954d7ea5cd67 stable tip

stack: when stack base is obsolete, pick any successor, even if at random

There are situations when s0 is obsolete and we also cannot pick just one
successor for it to use in stack. In such a case, let's pick the "latest"
successor from the first set.

We're assuming that obsutil.successorssets() returns data in the same order (it
should, since it makes sure to sort data internally). Keeping that in mind,
while the successor picked for s0 by this code is not based on any sort of
sophisticated logic, it should nonetheless be the same every time.

This patch is probably not going to completely break anything that was
previously working fine, because the previous behavior was to just abort with
an exception.

#!/bin/sh
# setup config and various utility to test content-divergence resolution

. $TESTDIR/testlib/common.sh

cat >> $HGRCPATH <<EOF
[ui]
# simpler log output
logtemplate ="{rev}:{node|short} ({phase}): {desc|firstline} {if(troubles, '[{troubles}]')}\n"

[phases]
# non publishing server
publish=False

[extensions]
evolve=
rebase=
EOF

setuprepos() {
    echo creating test repo for test case $1
    mkdir $1
    cd $1

    echo - upstream
    hg init upstream
    cd upstream
    mkcommit O
    hg phase --public .
    cd ..
    echo - local
    hg clone -q upstream local
    echo - other
    hg clone -q upstream other
    echo 'cd into `local` and proceed with env setup'
}