Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2 @ 4869:be591b740e0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle CGI SSL detection via HTTPS environment better. Some servers send on/off, 0/1, yes/no, and may be upper or lower case. This fix will handle all of those permutations. It was inspired by the detection done in in some other wsgi python web applications I looked at.
author Wesley J. Landaker <wjl@icecavern.net>
date Thu, 12 Jul 2007 13:55:20 -0600
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