Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-unrelated-pull @ 5335:88e931f74e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:00:11 -0300
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