Mercurial > hg
view tests/test-install.t @ 13531:67fbe566eff1 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 but it is much simpler than rewriting our own
purge command for subversion.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 04 Mar 2011 14:00:49 +0100 |
| parents | 97ffc68f71d3 |
| children | 85d74f6babf6 |
line wrap: on
line source
hg debuginstall $ hg debuginstall Checking encoding (ascii)... Checking installed modules (*/mercurial)... (glob) Checking templates... Checking patch... Checking commit editor... Checking username... No problems detected hg debuginstall with no username $ HGUSER= hg debuginstall Checking encoding (ascii)... Checking installed modules (*/mercurial)... (glob) Checking templates... Checking patch... Checking commit editor... Checking username... no username supplied (see "hg help config") (specify a username in your configuration file) 1 problems detected, please check your install! [1]