Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-pull-update @ 5271:5c2ca6d6ab21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 31 Aug 2007 12:32:18 +0200
parents 73fdc8bd3ed8
children
line wrap: on
line source

#!/bin/sh
#

hg init t
cd t
echo 1 > foo
hg ci -Am m

cd ..
hg clone t tt
cd tt
echo 1.1 > foo
hg ci -Am m

cd ../t
echo 1.2 > foo
hg ci -Am m
echo % should fail
hg pull -u ../tt

cd ../tt
echo % should fail
hg pull -u ../t
HGMERGE=true hg merge
hg ci -mm

cd ../t
echo % should work
hg pull -u ../tt