tests/test-update-renames
author Christian Ebert <blacktrash@gmx.net>
Thu, 03 Jun 2010 10:37:31 +0100
changeset 11296 0054a328b98f
parent 10874 4f11978ae45d
permissions -rwxr-xr-x
keyword: use context to detect uncommitted merge

#!/bin/sh

# test update logic when there are renames


# update with local changes across a file rename
hg init a
cd a
echo a > a
hg add a
hg ci -m a
hg mv a b
hg ci -m rename
echo b > b
hg ci -m change
hg up -q 0
echo c > a
hg up
cd ..