Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-pull-update @ 5445:64cf1c853674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: reduce memory usage in addgroup - use a buffer to extract the delta from a chunk - avoid concatenating to a compressed delta - use a buffer to directly extra full text from a trivial delta - delete chunk and delta objects after use
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:47 -0500
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