tests/test-merge8
author Emanuele Aina <em@nerd.ocracy.org>
Sat, 23 Jun 2007 22:26:22 -0500
changeset 4695 c3da7b6cc975
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
purge: add the clean alias inspired by git-clean and svn-clean

#!/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