Re: Changing Properties on File Added During Merge
Brian Buesker wrote:
>I encountered something unexpected when working with properties. The
> sequence of steps I performed (which are also reproduced in the attached
> script) are as follows:
> 1. Add an executable file in a checkout from dir1 and commit it.
> 2. Merge the changes made in step 1 into a working copy checked out
> from dir2.
> * As expected, the execute bits are not properly set on the
> file, so I fix that up manually.
> 3. Remove the svn:executable property on the file.
> * This unsets the execute bits and an svn proplist on the file
> no longer shows the property.
> * svn status just shows an A in the first column and a '+' in
> the fourth, with nothing shown in the second column where I
> would have expected an 'M' since the properties were modified.
> 4. Commit the file and then check out a new working copy from dir2.
> * The file still has the svn:executable property.
> 5. Remove the property again and commit.
> * This time I see the expected output from svn status and the
> property is actually removed in the repository.
> I was expecting to be able to modify the properties of a file that was
> added during a merge without first having to do a commit. This seems to
> not be the case. My guess is that since it is a commit with history, the
> properties are being taken from the revision in the repository without
> being merged with those in the working copy, although this is just an
> educated guess without looking at the code. Is this a limitation of the
> design or a bug?
> Here is my environment:
> OS: Fedora Core 3
> SVN Version:
> $ svn --version
> svn, version 1.1.2 (r12471)
> compiled Jan 7 2005, 15:34:50
Is a bug, appears to be fixed on trunk, though.
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Mon Feb 7 17:30:17 2005
This is an archived mail posted to the Subversion Users