Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2 @ 5366:d0c48891dd4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bdiff: switch to lyhash lyhash is a very simple and fast hash function that had the fewest hash collisions on a 3.9M line text corpus and 190k line binary corpus and should have significantly fewer collisions than the current hash function.
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Sep 2007 23:59:18 -0500
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