mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
13bbfcaf55
if a file was removed, hg add shouldn't mark the file as added, but as normal see issue683
43 lines
363 B
Bash
Executable File
43 lines
363 B
Bash
Executable File
#!/bin/sh
|
|
|
|
hg init a
|
|
cd a
|
|
echo a > a
|
|
hg add -n
|
|
hg st
|
|
hg add
|
|
hg st
|
|
|
|
echo b > b
|
|
hg add -n b
|
|
hg st
|
|
hg add b
|
|
hg st
|
|
echo % should fail
|
|
hg add b
|
|
hg st
|
|
|
|
hg ci -m 0
|
|
echo % should fail
|
|
hg add a
|
|
|
|
echo aa > a
|
|
hg ci -m 1
|
|
hg up 0
|
|
echo aaa > a
|
|
hg ci -m 2
|
|
|
|
hg merge
|
|
hg st
|
|
echo % should fail
|
|
hg add a
|
|
hg st
|
|
hg ci -m merge
|
|
|
|
echo % issue683
|
|
hg rm a
|
|
hg st
|
|
echo a > a
|
|
hg add a
|
|
hg st
|