Re: AW: Problem merging with svn:keywords - now another prob

On Apr 3, 2008, at 23:45, Volker wrote:

> sorry, the replay is:
>
> - create a file in trunk containing (the 1.44 came from an old CVS
> keyword expansion)
> * @version $Revision: 1.44 $
> ...
> * @since $Date: 2008-04-04 06:12:49 +0200 (Fri, 04 Apr 2008) $
>
> - add and commit it
> - put some changes to the file
> - svn propset svn:keywords "Date Revision"
> - commit OK
> - go to a branch and merge the resulted revision from the trunk
> - gives the conflict dialogue
>
> May I use the propset only solely without text changes ?

I think the answer to your question is no. Setting the svn:keywords
property to include Revision, for example, will cause the line
"$Revision: 1.44 $" to be changed to "$Revision$". This is necessary;
there's no way to make that not happen, short of not setting the
svn:keywords property.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-07 04:09:54 CEST