Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-unrelated-pull @ 5043:8b1ee1f59b3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: improve error message on file/directory clash
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 01 Aug 2007 12:03:10 -0700
parents dac4bd67f6c5
children
line wrap: on
line source

#!/bin/sh

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "1000000 0"

cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "1000000 0"

hg pull ../a
hg pull -f ../a
hg heads