Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2 @ 4797:d00ca99bc54e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert svn: minor improvement to tag detection. The better way is probably to list the latest tags directory and look up the last log message for each entry. This is surprisingly annoying to do.
author Brendan Cully <brendan@kublai.com>
date Tue, 03 Jul 2007 20:22:39 -0700
parents c95060a5391a
children
line wrap: on
line source

#!/bin/sh

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C