tests/test-merge-local
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 06 Aug 2007 00:35:06 -0300
changeset 5081 167c422c745f
parent 4361 46280c004f22
permissions -rwxr-xr-x
httprepo: quote the path part of the URL This should fix a 'hg clone "http://hg.example.org/path with spaces/"' The code tries to do the right thing when the user passes a path that's already escaped in part (e.g. "http://hg.example.org/path%20with spaces/"). If we're redirected, urllib2 will happily follow the URL it's given without escaping anything. I'm not sure what we would have to hook to work around that.

#!/bin/sh

hg init

echo "# revision 0"
echo "unchanged" > unchanged
echo "remove me" > remove
echo "copy me" > copy
echo "move me" > move
for i in 1 2 3 4 5 6 7 8 9; do
    echo "merge ok $i" >> zzz1_merge_ok
done
echo "merge bad" > zzz2_merge_bad
hg ci -Am "revision 0" -d "1000000 0"

echo "# revision 1"
hg rm remove
hg mv move moved
hg cp copy copied
echo "added" > added
hg add added
echo "new first line" > zzz1_merge_ok
hg cat zzz1_merge_ok >> zzz1_merge_ok
echo "new last line" >> zzz2_merge_bad
hg ci -m "revision 1" -d "1000000 0"

echo "# local changes to revision 0"
hg co 0
echo "new last line" >> zzz1_merge_ok
echo "another last line" >> zzz2_merge_bad
hg diff --nodates | grep "^[+-][^<>]"
hg st

echo "# local merge with bad merge tool"
HGMERGE=false hg co
hg co 0
hg diff --nodates | grep "^[+-][^<>]"
hg st

echo "# local merge with conflicts"
hg co
hg co 0
hg diff --nodates | grep "^[+-][^<>]"
hg st

echo "# local merge without conflicts"
hg revert zzz2_merge_bad
hg co
hg diff --nodates | grep "^[+-][^<>]"
hg st