Mercurial > hg
view tests/test-impexp-branch @ 5278:70e9a527cc61
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 01 Sep 2007 02:49:18 -0300 |
parents | 32ea809e5bd1 |
children |
line wrap: on
line source
#!/bin/sh cat >findbranch.py <<EOF import re, sys head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') for line in sys.stdin: hmatch = head_re.match(line) if not hmatch: sys.exit(1) if hmatch.group(1) == 'Branch': sys.exit(0) sys.exit(1) EOF hg init a cd a echo "Rev 1" >rev hg add rev hg commit -m "No branch." hg branch abranch echo "Rev 2" >rev hg commit -m "With branch." if hg export 0 | python ../findbranch.py; then echo "Export of default branch revision has Branch header" 1>&2 exit 1 fi if hg export 1 | python ../findbranch.py; then : # Do nothing else echo "Export of branch revision is missing Branch header" 1>&2 exit 1 fi # Make sure import still works with branch information in patches. cd .. hg init b cd b hg -R ../a export 0 | hg import - hg -R ../a export 1 | hg import - cd .. rm -rf b hg init b cd b hg -R ../a export 0 | hg import --exact - hg -R ../a export 1 | hg import --exact -