##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

profiling: dropping hotshot profiling. --profile as a unique profiling option...
profiling: dropping hotshot profiling. --profile as a unique profiling option hotshot was an experimental module, which is broken for Python < 2.5 And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile (formerly lsprof) should be used instead.
Matt Mackall - - Load All Authors

File last commit:

r4115:c95060a5 default
r8021:1c2cf2e5 default
Show More
test-rename-dir-merge2
28 lines | 279 B | text/plain | TextLexer
/ tests / test-rename-dir-merge2
History | Annotation | Raw |Copy content |Copy permalink
#!/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