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 but it is much simpler than rewriting our own
purge command for subversion.
$ hg init repo
$ cd repo
$ touch foo
$ hg ci -Am 'add foo'
adding foo
$ hg up -C null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
this should be stored as a delta against rev 0
$ echo foo bar baz > foo
$ hg ci -Am 'add foo again'
adding foo
created new head
$ hg debugindex .hg/store/data/foo.i
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 24 0 1 0376abec49b8 000000000000 000000000000