Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2 @ 4558:a73d80d6385a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 12 Jun 2007 17:39:57 +0200
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