Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-clone-pull-corruption @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 81ca1a9bd061 |
children |
line wrap: on
line source
#!/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