view tests/test-merge8 @ 4733:0ecfc3b3f072

Simplified earlygetopt and made it remove parsed options and values. The order of aliases is no longer important, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 28 Jun 2007 15:56:25 +0200
parents efbe24c7d8d9
children
line wrap: on
line source

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