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

r1785:81ca1a9b default
r11237:feb2a58f stable
Show More
test-clone-pull-corruption
32 lines | 619 B | text/plain | TextLexer
/ tests / test-clone-pull-corruption
#!/bin/sh
#
# Corrupt an hg repo with a pull started during an aborted commit
#
# Create two repos, so that one of them can pull from the other one.
hg init source
cd source
touch foo
hg add foo
hg ci -m 'add foo'
hg clone . ../corrupted
echo >> foo
hg ci -m 'change foo'
# Add a hook to wait 5 seconds and then abort the commit
cd ../corrupted
echo '[hooks]' >> .hg/hgrc
echo 'pretxncommit = sleep 5; exit 1' >> .hg/hgrc
# start a commit...
touch bar
hg add bar
hg ci -m 'add bar' &
# ... and start a pull while the commit is still running
sleep 1
hg pull ../source 2>/dev/null
# see what happened
wait
hg verify