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

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

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: Thu, 3 Apr 2008 22:43:09 -0700

On Thu, Apr 3, 2008 at 9:45 PM, Volker <sanam_dry_chili_at_yahoo.de> wrote:

> Hi all,
>
> 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
>

I assume that before you make the changes in the next step, this file was
branched out.

>
> - 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 ?
>
>
Please read about svn:keywords in this chapter:
http://svnbook.red-bean.com/en/1.0/ch07s02.html

Subversion was designed in such a way that changes to the keywords don't
cause conflict. However in your situation, you have the keywords set in
trunk and not set in the branch. Once you also set the svn:keyword property
on the branch, the conflict will no longer appear.

For the first merge, it is better for you to resolve the conflict by
resetting your keyword texts ($Revision: $) in your branch and then
committing it. And this way future merges will never have conflicts on the
keyword texts.

Regards,
-Hari
Received on 2008-04-04 07:46:26 CEST

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