tests/test-rename-dir-merge2
author Paolo Giarrusso <p.giarrusso@gmail.com>
Sat, 21 Aug 2010 00:33:13 +0200
branchstable
changeset 12221 0392a605bbce
parent 4115 c95060a5391a
permissions -rwxr-xr-x
i18n-it: remove bogus fuzzy translations for revset The translations were all random fuzzy strings, which can only do harm, so remove them. Moreover, given the status of revset (it seems mostly an internal undocumented module, and to understand it you need the source anyway), I prefer not to translate it for now.

#!/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