mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
29 lines
279 B
Bash
Executable File
29 lines
279 B
Bash
Executable File
#!/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
|