##// END OF EJS Templates
record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

File last commit:

r8855:f331de88 default
r11237:feb2a58f stable
Show More
test-up-issue1456
24 lines | 275 B | text/plain | TextLexer
#!/bin/sh
rm -rf a
hg init a
cd a
echo foo > foo
hg ci -qAm0
chmod +x foo
hg ci -m1
hg co -q 0
echo dirty > foo
hg up -c
hg up -q
cat foo
hg st -A
echo '% validate update of standalone execute bit change'
hg up -C 0
chmod -x foo
hg ci -m removeexec
hg up -C 0
hg up
hg st