Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2 @ 4810:f7c8222920ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.
author Brendan Cully <brendan@kublai.com>
date Thu, 05 Jul 2007 12:18:01 -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