view tests/test-merge8 @ 7432:642754e776e2

rpm spec: include python egg in rpm Better complicance with packaging guidelines http://fedoraproject.org/wiki/Packaging/Python http://fedoraproject.org/wiki/Packaging/Python/Eggs
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 27 Nov 2008 01:10:27 +0100
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