mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
2085d36412
switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests
47 lines
724 B
Bash
Executable File
47 lines
724 B
Bash
Executable File
#!/bin/sh
|
|
|
|
cat <<'EOF' > merge
|
|
#!/bin/sh
|
|
echo merging for `basename $1`
|
|
EOF
|
|
chmod +x merge
|
|
HGMERGE=./merge; export HGMERGE
|
|
|
|
mkdir A1
|
|
cd A1
|
|
hg init
|
|
echo This is file foo1 > foo
|
|
echo This is file bar1 > bar
|
|
hg add foo bar
|
|
hg commit -m "commit text" -d "1000000 0"
|
|
|
|
cd ..
|
|
hg clone A1 B1
|
|
|
|
cd A1
|
|
rm bar
|
|
hg remove bar
|
|
hg commit -m "commit test" -d "1000000 0"
|
|
|
|
cd ../B1
|
|
echo This is file foo22 > foo
|
|
hg commit -m "commit test" -d "1000000 0"
|
|
|
|
cd ..
|
|
hg clone A1 A2
|
|
hg clone B1 B2
|
|
|
|
cd A1
|
|
hg pull ../B1
|
|
hg merge
|
|
hg commit -m "commit test" -d "1000000 0"
|
|
echo bar should remain deleted.
|
|
hg manifest --debug
|
|
|
|
cd ../B2
|
|
hg pull ../A2
|
|
hg merge
|
|
hg commit -m "commit test" -d "1000000 0"
|
|
echo bar should remain deleted.
|
|
hg manifest --debug
|