##// 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:

r3853:c0b44915 default
r6385:0d4e068e default
Show More
test-lock-badness
11 lines | 169 B | text/plain | TextLexer
/ tests / test-lock-badness
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 #!/bin/sh
hg init a
echo a > a/a
hg --cwd a ci -A -m a
hg clone a b
echo b > b/b
hg --cwd b ci -A -m b
Benoit Boissinot
switch to the .hg/store layout, fix the tests
r3853 chmod 100 a/.hg/store
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 hg --cwd b push ../a
Benoit Boissinot
switch to the .hg/store layout, fix the tests
r3853 chmod 700 a/.hg/store