tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Feb 2008 17:51:30 +0100
changeset 6136 acfb9fa494e2
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
hgweb: Pass only filename instead of full path when downloading raw files. Before this patch "filename=foo/bar" was sent and e.g. Firefox offered to save the file as "foo-bar" instead of just "bar".

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update