Dev - SVN keywords
Locked
 
|
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 |
Administrator
|
Hi Jacopo,
Do you remember this message (attached) from T E Schmitz ? Jacques ----- Original Message ----- From: "Jacopo Cappellato" <[hidden email]> To: "OFBiz Project Development Discussion (High Traffic)" <[hidden email]> Sent: Saturday, March 25, 2006 6:39 PM Subject: [OFBiz] Dev - SVN keywords > 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 Hello David, T E Schmitz wrote: > David E. Jones wrote: > >> >> I did a search for a $Rev:$ and replaced with $Rev$, though on commit >> it didn't expand the keyword... I'm guessing that some SVN flag/ >> property needs to be changed for these files, does anyone know how to > > > either in the Subversion config file (on Unix ~/.subversion/config): > * = svn:keywords=LastChangedDate Revision Author > or just > * = svn:keywords=Revision > DO NOT enable keyword expansion on all files as I did above (* = svn:keywords=Revision), just on text files!!!! svn:keyword allows Subversion to change the file if it finds keyword placeholders in it. When I checked out OFBiz from my repository the build failed because the worldpay jar had got "corrupted" upon import and was no longer a valid archive. As I know now that was my own stupid fault trying to save myself spelling out dozens of extensions. -- Regards/Gruß, Tarlika Elisabeth Schmitz _______________________________________________ Users mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/users _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Jacopo Cappellato
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 |
|
|
Merging through SVK mirror repository isn't affected by keywords.
Vinay -----Original Message----- From: [hidden email] [mailto:[hidden email]] On Behalf Of David E. Jones Sent: Saturday, March 25, 2006 6:59 PM To: OFBiz Project Development Discussion Subject: Re: [OFBiz] Dev - SVN keywords 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 _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Jacopo Cappellato
This is good: I know that SVK is designed to easily mirror SVN
repositories... and it's nice to know that also keyword expansion is not a problem. By the way, I've updated the Wiki page with the standard Vendor Branch strategy for SVN (no SVK) and I did a few tests, now it seems to work: http://ofbizwiki.go-integral.com/Wiki.jsp?page=SVNTips Anyone can help me to answer the BIG QUESTION at the bottom of the page? Also any review is welcome! Thanks, Jacopo Vinay Agarwal wrote: > Merging through SVK mirror repository isn't affected by keywords. > Vinay > > -----Original Message----- > From: [hidden email] [mailto:[hidden email]] On > Behalf Of David E. Jones > Sent: Saturday, March 25, 2006 6:59 PM > To: OFBiz Project Development Discussion > Subject: Re: [OFBiz] Dev - SVN keywords > > > 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 > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
On Monday, March 27, 2006 8:24 AM +0200 Jacopo Cappellato <[hidden email]>
wrote: > Anyone can help me to answer the BIG QUESTION at the bottom of the page? > Also any review is welcome! svn merge arg1 arg2 arg3 This takes the difference between arg1 and arg2 and applies the result to arg3. So if arg3 (your working copy) started as r5000 but has all changes in r5100 already merged in, arg1 should be the vendor source for r5100. (arg2 is the latest vendor drop.) _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
Kenneth,
thanks!!! Jacopo Kenneth Porter wrote: > On Monday, March 27, 2006 8:24 AM +0200 Jacopo Cappellato <[hidden email]> > wrote: > >> Anyone can help me to answer the BIG QUESTION at the bottom of the page? >> Also any review is welcome! > > svn merge arg1 arg2 arg3 > > This takes the difference between arg1 and arg2 and applies the result to > arg3. So if arg3 (your working copy) started as r5000 but has all changes > in r5100 already merged in, arg1 should be the vendor source for r5100. > (arg2 is the latest vendor drop.) > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by David E. Jones
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 |
|
Administrator
|
I remember now some problems I had when begining to submit patches. I was
willing to put my name and email as author and was never able to do so. I asked to the community about that problem but no one was really aware. I think now that it's because of keywords expansion. So if a vote is running I would clearly vote to remove them. Jacques ----- Original Message ----- From: "Jacopo Cappellato" <[hidden email]> To: "OFBiz Project Development Discussion" <[hidden email]> Sent: Saturday, April 08, 2006 11:27 AM Subject: Re: [OFBiz] Dev - SVN keywords > 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 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 _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Jacopo Cappellato
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 you will receive the actual tag back when you checkout/export instead of the parsed tag. i.e. $Id$ this should help with your merging issues. Since this is client controlled, I prefer to keep the tags in the files so we can use them when generating javadocs and other information. Andy On Apr 8, 2006, at 5:27 AM, Jacopo Cappellato wrote: > 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 _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
Andy,
are you sure about it? It is true that keywords in source files are stored unexpanded in SVN and they are expanded only when the checkout/export is done. However I couldn't find a way to disable the expansion since the expansion is triggered by the "svn:keywords" property that is stored in SVN with the source files... Jacopo A. Zeneski wrote: > 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 > you will receive the actual tag back when you checkout/export instead > of the parsed tag. i.e. $Id$ this should help with your merging issues. > > Since this is client controlled, I prefer to keep the tags in the > files so we can use them when generating javadocs and other information. > > Andy _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
Administrator
|
In reply to this post by Andrew Zeneski
Interesting, thanks.
Jacques ----- Original Message ----- From: "A. Zeneski" <[hidden email]> To: "OFBiz Project Development Discussion" <[hidden email]> Sent: Saturday, April 08, 2006 4:28 PM Subject: Re: [OFBiz] Dev - SVN keywords > 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 > you will receive the actual tag back when you checkout/export instead > of the parsed tag. i.e. $Id$ this should help with your merging issues. > > Since this is client controlled, I prefer to keep the tags in the > files so we can use them when generating javadocs and other information. > > Andy > > On Apr 8, 2006, at 5:27 AM, Jacopo Cappellato wrote: > > > 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 > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Andrew Zeneski
On the other hand... if people are using different settings there will still be conflicts. Generally the ones that cause problems when adding an author line and such are the @version $Rev$ ones that are nearby. The $Id$ ones at the beginning aren't such a big deal, but as we discussed a while back there are still issues with these and there are some good reasons to just not use them at all... -David A. Zeneski wrote: > 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 > you will receive the actual tag back when you checkout/export instead > of the parsed tag. i.e. $Id$ this should help with your merging issues. > > Since this is client controlled, I prefer to keep the tags in the > files so we can use them when generating javadocs and other information. > > Andy > > On Apr 8, 2006, at 5:27 AM, Jacopo Cappellato wrote: > >> 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 > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
Administrator
|
So we have to vote, isn't ?
Jacques ----- Original Message ----- From: "David E. Jones" <[hidden email]> To: "OFBiz Project Development Discussion" <[hidden email]> Sent: Saturday, April 08, 2006 5:33 PM Subject: Re: [OFBiz] Dev - SVN keywords > > On the other hand... if people are using different settings there will still be conflicts. > > Generally the ones that cause problems when adding an author line and such are the @version $Rev$ ones that are nearby. The $Id$ ones at the beginning aren't such a big deal, but as we discussed a while back there are still issues with these and there are some good reasons to just not use them at all... > > -David > > > A. Zeneski wrote: > > 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 > > you will receive the actual tag back when you checkout/export instead > > of the parsed tag. i.e. $Id$ this should help with your merging issues. > > > > Since this is client controlled, I prefer to keep the tags in the > > files so we can use them when generating javadocs and other information. > > > > Andy > > > > On Apr 8, 2006, at 5:27 AM, Jacopo Cappellato wrote: > > > >> 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 > > > > > > _______________________________________________ > > Dev mailing list > > [hidden email] > > http://lists.ofbiz.org/mailman/listinfo/dev > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
Administrator
|
In reply to this post by Jacopo Cappellato
Sorry Jacopo,
I received your message after sending mine (interesting thanks) Jacques ----- Original Message ----- From: "Jacopo Cappellato" <[hidden email]> To: "OFBiz Project Development Discussion" <[hidden email]> Sent: Saturday, April 08, 2006 5:30 PM Subject: Re: [OFBiz] Dev - SVN keywords > Andy, > > are you sure about it? It is true that keywords in source files are > stored unexpanded in SVN and they are expanded only when the > checkout/export is done. > However I couldn't find a way to disable the expansion since the > expansion is triggered by the "svn:keywords" property that is stored in > SVN with the source files... > > Jacopo > > > A. Zeneski wrote: > > 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 > > you will receive the actual tag back when you checkout/export instead > > of the parsed tag. i.e. $Id$ this should help with your merging issues. > > > > Since this is client controlled, I prefer to keep the tags in the > > files so we can use them when generating javadocs and other information. > > > > Andy > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Jacques Le Roux
I think we should continue this interesting thread a bit more before
starting a vote. Jacopo Jacques Le Roux wrote: > So we have to vote, isn't ? > > Jacques > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
In reply to this post by Jacopo Cappellato
Hi,
some time ago I've asked in this thread the developers' opinion about the opportunity to keep svn keywords expansion switched on. I'd like to remove keywords from source files to avoid merging/import problems, but also because this kind of meta information is better managed in svn logs. David, Andy, Jacques had already post some interesting comments... any other opinion? Should we start a vote? I think that, now that we are slowly migrating to the new ASL2.0 license, it is a good opportunity to take a decision on this too. Jacopo Jacopo Cappellato wrote: > Andy, > > are you sure about it? It is true that keywords in source files are > stored unexpanded in SVN and they are expanded only when the > checkout/export is done. > However I couldn't find a way to disable the expansion since the > expansion is triggered by the "svn:keywords" property that is stored in > SVN with the source files... > > Jacopo > > > A. Zeneski wrote: >> 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 >> you will receive the actual tag back when you checkout/export instead >> of the parsed tag. i.e. $Id$ this should help with your merging issues. >> >> Since this is client controlled, I prefer to keep the tags in the >> files so we can use them when generating javadocs and other information. >> >> Andy > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
|
Switch expansion off. I have never found this to be of much use.
Vinay -----Original Message----- From: [hidden email] [mailto:[hidden email]] On Behalf Of Jacopo Cappellato Sent: Saturday, May 13, 2006 7:25 AM To: OFBiz Project Development Discussion Subject: Re: [OFBiz] Dev - SVN keywords Hi, some time ago I've asked in this thread the developers' opinion about the opportunity to keep svn keywords expansion switched on. I'd like to remove keywords from source files to avoid merging/import problems, but also because this kind of meta information is better managed in svn logs. David, Andy, Jacques had already post some interesting comments... any other opinion? Should we start a vote? I think that, now that we are slowly migrating to the new ASL2.0 license, it is a good opportunity to take a decision on this too. Jacopo Jacopo Cappellato wrote: > Andy, > > are you sure about it? It is true that keywords in source files are > stored unexpanded in SVN and they are expanded only when the > checkout/export is done. > However I couldn't find a way to disable the expansion since the > expansion is triggered by the "svn:keywords" property that is stored in > SVN with the source files... > > Jacopo > > > A. Zeneski wrote: >> 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 >> you will receive the actual tag back when you checkout/export instead >> of the parsed tag. i.e. $Id$ this should help with your merging issues. >> >> Since this is client controlled, I prefer to keep the tags in the >> files so we can use them when generating javadocs and other information. >> >> Andy > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
|
Administrator
|
In reply to this post by Jacopo Cappellato
> Switch expansion off. I have never found this to be of much use. > Vinay I agree that sometimes keywords give some troubles with merging and . But if they are usefull, why not keep them ? For instance, knowing the date and the author of the last modification may be usefull. Jacques > -----Original Message----- > From: [hidden email] [mailto:[hidden email]] On > Behalf Of Jacopo Cappellato > Sent: Saturday, May 13, 2006 7:25 AM > To: OFBiz Project Development Discussion > Subject: Re: [OFBiz] Dev - SVN keywords > > Hi, > > some time ago I've asked in this thread the developers' opinion about > the opportunity to keep svn keywords expansion switched on. > > I'd like to remove keywords from source files to avoid merging/import > problems, but also because this kind of meta information is better > managed in svn logs. > > David, Andy, Jacques had already post some interesting comments... any > other opinion? Should we start a vote? > > I think that, now that we are slowly migrating to the new ASL2.0 > license, it is a good opportunity to take a decision on this too. > > Jacopo > > > Jacopo Cappellato wrote: > > Andy, > > > > are you sure about it? It is true that keywords in source files are > > stored unexpanded in SVN and they are expanded only when the > > checkout/export is done. > > However I couldn't find a way to disable the expansion since the > > expansion is triggered by the "svn:keywords" property that is stored in > > SVN with the source files... > > > > Jacopo > > > > > > A. Zeneski wrote: > >> 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 > >> you will receive the actual tag back when you checkout/export instead > >> of the parsed tag. i.e. $Id$ this should help with your merging issues. > >> > >> Since this is client controlled, I prefer to keep the tags in the > >> files so we can use them when generating javadocs and other information. > >> > >> Andy > > > > > > _______________________________________________ > > Dev mailing list > > [hidden email] > > http://lists.ofbiz.org/mailman/listinfo/dev > > > > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev > > _______________________________________________ > Dev mailing list > [hidden email] > http://lists.ofbiz.org/mailman/listinfo/dev _______________________________________________ Dev mailing list [hidden email] http://lists.ofbiz.org/mailman/listinfo/dev |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |