##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r6888:7c36a4fb default
r7278:45495d78 default
Show More
test-add
49 lines | 536 B | text/plain | TextLexer
Benoit Boissinot
make hg add of a removed file unremove the file...
r5207 #!/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
Patrick Mezard
commands: add exits(1) if a specified file cannot be added (issue 891)
r5688 hg add b || echo "failed to add b"
Benoit Boissinot
make hg add of a removed file unremove the file...
r5207 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
Stefano Tortarolo
make commit fail when committing unresolved files
r6888 hg resolve -m a
Benoit Boissinot
make hg add of a removed file unremove the file...
r5207 hg ci -m merge
echo % issue683
hg rm a
hg st
echo a > a
hg add a
hg st
Patrick Mezard
commands: add exits(1) if a specified file cannot be added (issue 891)
r5688
hg add c && echo "unexpected addition of missing file"
echo c > c
hg add d c && echo "unexpected addition of missing file"
hg st