[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35809 - branches/1.5.x

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Wed, 11 Feb 2009 14:00:22 -0600

On Feb 11, 2009, at 2:24 AM, Daniel Shahaf wrote:

> Author: danielsh
> Date: Wed Feb 11 00:24:50 2009
> New Revision: 35809
>
> Log:
> Vote for r32448 and r35143.
...
>
> Approved changes:
> =================
> +
> + * 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.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1140518
Received on 2009-02-11 21:00:54 CET

This is an archived mail posted to the Subversion Dev mailing list.