Fri, 04 Mar 2011 14:00:49 +0100 subrepo: handle svn tracked/unknown directory collisions stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 13531
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.
Thu, 03 Mar 2011 22:41:38 +0100 convert/svn: stop using svn bindings when pushing to svn
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:41:38 +0100] rev 13530
convert/svn: stop using svn bindings when pushing to svn
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip