annotate tests/test-impexp-branch.t @ 14050:9e8a9d45945c stable

subrepo: handle svn tracked/unknown directory collisions

This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.

Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.

  $ 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
  marked working directory as 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 -
  applying patch from stdin
  $ hg -R ../a export 1 | hg import -
  applying patch from stdin
  $ cd ..
  $ rm -rf b
  $ hg init b
  $ cd b
  $ hg -R ../a export 0 | hg import --exact -
  applying patch from stdin
  $ hg -R ../a export 1 | hg import --exact -
  applying patch from stdin