annotate tests/test-branch-option @ 11965:77f1f206e135 stable

mq: don't inherit default and default-push paths with --mq (issue2333)

Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.

#!/bin/sh

# test branch selection options
hg init branch
cd branch
hg branch a
echo a > foo
hg ci -d '0 0' -Ama
echo a2 > foo
hg ci -d '0 0' -ma2
hg up 0
hg branch c
echo c > foo
hg ci -d '0 0' -mc
hg tag -l z
cd ..
hg clone -r 0 branch branch2
cd branch2
hg up 0
hg branch b
echo b > foo
hg ci -d '0 0' -mb
hg up 0
hg --encoding utf-8 branch æ
echo ae1 > foo
hg ci -d '0 0' -mae1
hg up 0
hg --encoding utf-8 branch -f æ
echo ae2 > foo
hg ci -d '0 0' -mae2
hg up 0
hg branch -f b
echo b2 > foo
hg ci -d '0 0' -mb2

echo unknown branch and fallback
hg in -qbz
hg in -q ../branch#z
hg out -qbz
echo in rev c branch a
hg in -qr c ../branch#a
hg in -qr c -b a
echo out branch .
hg out -q ../branch#.
hg out -q -b .
echo out branch . non-ascii
hg --encoding utf-8 up æ
hg --encoding latin1 out -q ../branch#.
hg --encoding latin1 out -q -b .
echo clone branch b
cd ..
hg clone branch2#b branch3
hg -q -R branch3 heads b
hg -q -R branch3 parents
rm -rf branch3
echo clone rev a branch b
hg clone -r a branch2#b branch3
hg -q -R branch3 heads b
hg -q -R branch3 parents
rm -rf branch3