Daniel Shahaf wrote on Thu, 12 Feb 2009 at 08:31 +0200:
> Hyrum K. Wright wrote on Wed, 11 Feb 2009 at 14:00 -0600:
> > > + * r35143, r35145
> > > + Make it impossible to add .svn (and children) to your working copy via
> > > + svn add --parents .svn/file
> > > + svn mkdir --parents .svn/dir/dir
> > > + svn cp --parents file .svn/dir/file
> > > + Note: Small merge conflict in the tests lists of basic_tests.py.
> > > + Justification:
> > > + Failing to catch this breaks our administrative area handling.
> > > + Votes:
> > > + +1: rhuijben, stylesen, danielsh
> > > +
> >
> > Did anybody try merging these changes to 1.5.x? I get both textual, as well
> > as semantic conflicts when I attempt to merge r35143 and r35145 to the
> > release branch.
> >
Looks like it's already fixed in r35819.
Daniel
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1143308
Received on 2009-02-13 02:51:14 CET