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

Re: Bug in adding a binary file external

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 22 Apr 2009 11:50:23 -0400

On Wed, Apr 22, 2009 at 11:48 AM, Alexander Sinyushkin
<Alexander.Sinyushkin_at_svnkit.com> wrote:

> Recently we have discovered a strange behavior when
> adding an svn:external property which contains a binary file:
>
> ^/A/file.mp3 m.mp3
>
> That was the value of the svn:externals property. Committing the propset
> wasn't a problem. But then, if you make an update in the same or any
> other working copy, instead of a regular external add you are notified
> of a conflict on the binary file:
>
> alex_at_UFO:~/workspace/tmp/reppo-wc2$
> /home/alex/workspace/svn_1.6.1/subversion/svn/svn up
>  U   A/B
>
> Fetching external item into 'A/B/m.mp3'
> Conflict discovered in 'A/B/m.mp3'.
> Select: (p) postpone,
>         (mf) mine-full, (tf) theirs-full,
>         (s) show all options: p
> CU   A/B/m.mp3
> Updated external to revision 1003.
> Summary of conflicts in external item:
>   Text conflicts: 1
>
> Updated to revision 1003.
>
> The other working copy was clean, contained no changes or obstructed files.

I believe this is a known issue:

http://subversion.tigris.org/issues/show_bug.cgi?id=3368

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1862200
Received on 2009-04-22 17:50:39 CEST

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

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