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

Re: svn:executable not propagated to repository after a merge with a second repository

From: Stein Somers <ssomers_at_opnet.com>
Date: Mon, 31 May 2010 20:11:00 +0200

On 28-May-10 9:13, Holger Schmidt wrote:
> I have one repository with the development tree of some templates. Those
> templates are exported to projects that might customize the templates.
> The copy of the templates is added and committed to the project
> repository. In the projects the latest changes in the template
> development tree are integrated with a "svn merge $templateRepo@$revOld
> $templateRepo@$revNew .". So far, so good. But there is a problem if a
> property changed in the template repository, at least with
> svn:executable. The property is set in the project working copy where
> the merge is done, but a commit does not propagate the property to the
> repository.

And svn status and diff do not notice the difference between the working
copy and its repository. Deleting and recreating the property (with
value '*' of course) in the same working copy and committing causes it
to have an empty value in the repository. which is hard to delete: if
you check this out a fresh WC, svn proplist shows the property, but svn
propdel says "Attempting to delete nonexistent property 'svn:executable'".

> This is tested with svn 1.6.1 and 1.6.6.

And confirmed on 1.6.11, SummerSoft packages on CentOS 5.4

-- 
Stein
Received on 2010-05-31 20:11:39 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.