Mercurial > hg-stable
view tests/test-pull-pull-corruption2 @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | d181845bdc51 |
children |
line wrap: on
line source
#!/bin/sh # # Corrupt an hg repo with two pulls. # # create one repo with a long history hg init source1 cd source1 touch foo hg add foo for i in 1 2 3 4 5 6 7 8 9 10; do echo $i >> foo hg ci -m $i done cd .. # create a third repo to pull both other repos into it hg init version2 hg -R version2 pull source1 & sleep 1 hg clone --pull -U version2 corrupted wait hg -R corrupted verify hg -R version2 verify