mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
7930704b3e
The issue came from the 63f9ab8034d1 fix for issue586 working only for manifest.add() fast path, where the incorrect removed file set was ignored. This path was no longer taken after 5958346d119e refactoring.
50 lines
593 B
Bash
Executable File
50 lines
593 B
Bash
Executable File
#!/bin/sh
|
|
# a test for issue586
|
|
|
|
hg init a
|
|
cd a
|
|
echo a > a
|
|
hg ci -Ama
|
|
|
|
hg init ../b
|
|
cd ../b
|
|
echo b > b
|
|
hg ci -Amb
|
|
|
|
hg pull -f ../a
|
|
hg merge
|
|
hg rm -f a
|
|
hg ci -Amc
|
|
|
|
hg st -A
|
|
cd ..
|
|
|
|
# a test for issue 1433, related to issue586
|
|
echo % create test repos
|
|
hg init repoa
|
|
touch repoa/a
|
|
hg -R repoa ci -Am adda
|
|
|
|
hg init repob
|
|
touch repob/b
|
|
hg -R repob ci -Am addb
|
|
|
|
hg init repoc
|
|
cd repoc
|
|
hg pull ../repoa
|
|
hg update
|
|
mkdir tst
|
|
hg mv * tst
|
|
hg ci -m "import a in tst"
|
|
hg pull -f ../repob
|
|
echo % merge both repos
|
|
hg merge
|
|
mkdir src
|
|
echo % move b content
|
|
hg mv b src
|
|
hg ci -m "import b in src"
|
|
hg manifest
|
|
|
|
|
|
|