On Oct 11, 2007, at 7:14 AM, Brice Figureau wrote:
> Hi,
>
> I think I've found a bug, but as stated in the issuezilla
> netiquette, I
> first wanted to post it here, maybe I missed something obvious :-)
>
> Using subversion 1.4.4, it seems that properties added to the root
> directory of a working copy are not handled the same way as properties
> added to a regular directory below root, regarding conflicts.
>
> Ex:
> $ svnadmin create testprop
> $ svn co file://`pwd`/testprop
> Checked out revision 0.
> $ svn co file://`pwd`/testprop a
> Checked out revision 0.
> $ svn co file://`pwd`/testprop b
> Checked out revision 0.
> $ cd a
> $ svn mkdir dir
> A dir
> $ svn ci -m "r1"
> Adding dir
>
> Committed revision 1.
> $ svn propset 'prop' 'value 1' dir
> property 'prop' set on 'dir'
> $ svn ci -m "r2"
> Sending dir
>
> Committed revision 2.
> $ cd ../b
> $ svn up -r1
> A dir
> Updated to revision 1.
> $ svn propset 'prop' 'conflict' dir
> property 'prop' set on 'dir'
> $ svn ci -m "r3"
> Sending dir
> svn: Commit failed (details follow):
> svn: Out of date: '/dir' in transaction '2-1'
>
> The last commit has properly failed.
> Now doing the same test on the root directory of the working copy:
>
> $ svnadmin create testprop
> $ svn co file://`pwd`/testprop a
> Checked out revision 0.
> $ svn co file://`pwd`/testprop b
> Checked out revision 0.
> $ cd a
> $ svn propset 'prop' 'value 1' .
> property 'prop' set on '.'
> $ svn ci -m "r1"
> Sending .
>
> Committed revision 1.
> $ cd ../b
> $ svn propset 'prop' 'value 2' .
> property 'prop' set on '.'
> $ svn ci -m "r2"
> Sending .
>
> Committed revision 2.
>
> And it didn't fail...
> Is it the intended behavior ?
This looks like this bug which is a candidate for 1.4.6:
http://svn.collab.net/repos/svn/branches/1.4.x/STATUS
* r21406-21407, r21540
Fix issue #2608: Can set directory props on the root of an FSFS
filesystem from an out-of-date repository.
Justification:
Minor data loss bug. Has been in trunk for a year (so probably
safe). Now reported by a user
(http://svn.haxx.se/dev/archive-2007-09/0441.shtml). Has unit
and end-to-end tests.
Branch: 1.4.x-issue-2608 (resolving a trivial conflict and removing
an irrelevant helper function)
Votes:
+1: glasser, dlr
Regards,
Blair
--
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 12 16:08:24 2007