Keywords in SVN are handled by the client not the server. So, you can
configure your local SVN client to not parse keywords. In this case
of the parsed tag. i.e. $Id$ this should help with your merging issues.
> Should we ask for a vote on this issue? ("Should we remove all the
> svn keywords from source files to avoid conflicts in merging?").
>
> In the meantime, in the attached patch for the APACHE2_HEADER file
> I've removed the "Id" keyword... do you think we should commit this
> little change?
>
> Jacopo
>
> David E. Jones wrote:
>> In many ways I agree, they are way more of a pain than they are
>> worth in many ways... They do cause lots of merge problems, and I
>> wouldn't mind seeing them gone completely.
>> The information from them plus much more is available from the
>> command line svn tools like log and such...
>> Any other thoughts on this from anyone?
>> -David
>> Jacopo Cappellato wrote:
>>> Hi all,
>>>
>>> I'm diligently studying the "Pragmatic Version Control Using SVN"
>>> book by Mike Mason to get a deeper knowledge of the SVN secrets.
>>> I'm particularly interested in vendor branches and three way
>>> merging (you can see my notes here
http://ofbizwiki.go-
>>> integral.com/Wiki.jsp?page=SVNTips).
>>>
>>> In the book, the author advises against the use of keyword
>>> expansion in source files with some good reasonings (and one of
>>> these is that with keywords it's more difficult to merge
>>> different trunks).
>>>
>>> I'd like to get your feedback about this subject.
>>> Do you think that SVN keywords are useful in OFBiz? Would you
>>> consider to remove them? (It could be easy now that we are in the
>>> process of changing all the license header to the ASL2.0).
>>>
>>> Thanks,
>>>
>>> Jacopo
>>>
>>> PS: I know that Vinay Agarwal has setup another wiki page about
>>> SVK (
http://ofbizwiki.go-integral.com/Wiki.jsp?
>>> page=AlternateSVNTips), but I'm too lazy now to install a new
>>> tool ;-)
>>> _______________________________________________
>>> Dev mailing list
>>>
[hidden email]
>>>
http://lists.ofbiz.org/mailman/listinfo/dev>> _______________________________________________
>> Dev mailing list
>>
[hidden email]
>>
http://lists.ofbiz.org/mailman/listinfo/dev>
> Index: APACHE2_HEADER
> ===================================================================
> --- APACHE2_HEADER (revision 7181)
> +++ APACHE2_HEADER (working copy)
> @@ -16,7 +16,6 @@
> =====================================================================
> For Java and BSH Files:
> /*
> - * $Id: $
> *
> * Copyright 2001-2006 The Apache Software Foundation
> *
> @@ -37,7 +36,6 @@
> For XML Files:
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
> -$Id: $
>
> Copyright 2001-2006 The Apache Software Foundation
>
> @@ -57,7 +55,6 @@
> =====================================================================
> For FTL Files:
> <#--
> -$Id: $
>
> Copyright 2001-2006 The Apache Software Foundation
>
> @@ -77,7 +74,6 @@
> =====================================================================
> For Properties Files:
> #####################################################################
> -# $Id: $
> #
> # Copyright 2001-2006 The Apache Software Foundation
> #
>
> _______________________________________________
> Dev mailing list
>
[hidden email]
>
http://lists.ofbiz.org/mailman/listinfo/dev