tests/test-issue672
author Wagner Bruna <wbruna@softwareexpress.com.br>
Fri, 13 Aug 2010 13:32:05 -0300
branchstable
changeset 11844 6c51a5056020
parent 8167 6c82beaaa11a
permissions -rwxr-xr-x
http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.

#!/bin/sh

# 0-2-4
#  \ \ \
#   1-3-5
#
# rename in #1, content change in #4.

hg init t
cd t

touch 1
touch 2
hg commit -Am init  # 0

hg rename 1 1a
hg commit -m rename # 1

hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 # 2

hg merge --debug 1
hg ci -m merge1 # 3

hg co -C 2
echo hello >> 1
hg ci -m unrelated2 # 4

hg co -C 3
hg merge -y --debug 4

hg co -C 4
hg merge -y --debug 3