##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r5200:c7e8fe11 default
r6385:0d4e068e default
Show More
test-nested-repo
28 lines | 290 B | text/plain | TextLexer
Vadim Gelfer
support nested repositories....
r2061 #!/bin/sh
hg init a
cd a
hg init b
echo x > b/x
Bryan O'Sullivan
Make audit_path more stringent....
r5158
Vadim Gelfer
support nested repositories....
r2061 echo '# should print nothing'
Bryan O'Sullivan
Make audit_path more stringent....
r5158 hg add b
Vadim Gelfer
support nested repositories....
r2061 hg st
Bryan O'Sullivan
Make audit_path more stringent....
r5158
echo '# should fail'
Vadim Gelfer
support nested repositories....
r2061 hg st b/x
hg add b/x
Alexis S. L. Carvalho
path_auditor: cache names of audited directories...
r5200 echo '# should fail'
hg add b b/x
hg st
Bryan O'Sullivan
Make audit_path more stringent....
r5158 echo '# should arguably print nothing'
hg st b
echo a > a
hg ci -Ama a
echo '# should fail'
hg mv a b
Vadim Gelfer
support nested repositories....
r2061 hg st