view tests/test-rename-merge1 @ 3399:5dbb3a991bbf

Catch python2.3's IndexError with bogus http proxy settings. (issue203)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 15 Oct 2006 21:09:56 +0200
parents 764688cf51e5
children c0b449154a90
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start" -d "0 0"
hg mv a b
hg mv a2 b2
hg ci -m "rename" -d "0 0"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify" -d "0 0"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge" -d "0 0"
hg debugindex .hg/data/b.i
hg debugrename b