You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Ashish Vijaywargiya <as...@hotwaxmedia.com> on 2009/05/21 11:25:52 UTC
Re: Unable to commit changes from svn:mergeinfo file
AFAIK the use of maintaining the svn:mergeinfo is encouraged by
subversion project after release 1.5.
This is actually required when you maintain such release branch and that
takes update from trunk.
(As I remembered that something similar is commented by Jacuqes in past,
But I could be wrong.)
Sharing the link that can provide more insight:
http://subversion.tigris.org/merge-tracking/func-spec.html
Although I haven't read full details but certainly will read it in a day
or so.
Let see what Jacques has to say about it.
--
Ashish
Scott Gray wrote:
> Sorry if this is an svn noob question, but what's so great about this
> mergeinfo file that it's worth the extra effort anyway?
>
> Thanks
> Scott
>
> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>
>> Hello Jacques,
>>
>> As we all know that we are maintaining the details of revision (trunk
>> revision details that we apply to RB9.04) in the svn:mergeinfo file.
>> But certainly we(Me, Vikas and few others don't have framework and
>> OFBiz root files / folder write access) don't have commit right for
>> that file so most of the time we leave that file as it is.
>> And wait for someone like you to commit the changes later on.
>>
>> What can be the better solution to handle this ?
>> Is it good that we commit the code in release branch and explicitly
>> inform to commit the changes in svn:mergeinfo file ?
>>
>> Please let me know your thoughts on this, as your comment on this
>> will help us not to miss any version info from svn:mergeinfo file
>> after committing the code.
>> Thanks !
>>
>> --
>> Ashish
>>
>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Ashish Vijaywargiya <vi...@gmail.com>.
>> I can only think of one option at this moment that is to move the
svn:mergeinfo property to somewhere else, where everyone could commit the
changes and not just the committer having framework rights.
This is not possible AFAIK.
As it is Subversion standard and we are using it.
--
Ashish
On Thu, May 21, 2009 at 2:55 PM, Ashish Vijaywargiya <
ashish.vijaywargiya@hotwaxmedia.com> wrote:
> AFAIK the use of maintaining the svn:mergeinfo is encouraged by subversion
> project after release 1.5.
> This is actually required when you maintain such release branch and that
> takes update from trunk.
> (As I remembered that something similar is commented by Jacuqes in past,
> But I could be wrong.)
>
> Sharing the link that can provide more insight:
> http://subversion.tigris.org/merge-tracking/func-spec.html
> Although I haven't read full details but certainly will read it in a day or
> so.
>
> Let see what Jacques has to say about it.
>
> --
> Ashish
>
>
> Scott Gray wrote:
>
>> Sorry if this is an svn noob question, but what's so great about this
>> mergeinfo file that it's worth the extra effort anyway?
>>
>> Thanks
>> Scott
>>
>> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>>
>> Hello Jacques,
>>>
>>> As we all know that we are maintaining the details of revision (trunk
>>> revision details that we apply to RB9.04) in the svn:mergeinfo file.
>>> But certainly we(Me, Vikas and few others don't have framework and OFBiz
>>> root files / folder write access) don't have commit right for that file so
>>> most of the time we leave that file as it is.
>>> And wait for someone like you to commit the changes later on.
>>>
>>> What can be the better solution to handle this ?
>>> Is it good that we commit the code in release branch and explicitly
>>> inform to commit the changes in svn:mergeinfo file ?
>>>
>>> Please let me know your thoughts on this, as your comment on this will
>>> help us not to miss any version info from svn:mergeinfo file after
>>> committing the code.
>>> Thanks !
>>>
>>> --
>>> Ashish
>>>
>>>
>>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Jacques Le Roux <ja...@les7arts.com>.
I just read Ashish's link and I think it's even more interesting than links below...
Jacques
From: "Jacques Le Roux" <ja...@les7arts.com>
> Official documentation http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge.basicmerging.mergeinfo
> Unofficial but complementary (and translated in French :o)
> http://www.framalang.org/wiki/SVNBOOK_Chap4_Branching_and_Merging_Basic_Merging_Mergeinfo_and_Previews
> And even more complete http://www.open.collab.net/community/subversion/articles/merge-info.html (for tough readers :D)
>
> Yes, as you can see it's only about keeping tracks on merge, so it's useful but not necessary.
> This may prove useful for people willing to integrate some parts.
>
> I don't see any means to ignore merge-info, so a solution would be to allow all commiters to have write access on this.
> But (as it's explained above) it's a property of root (ie ".") and we have only 2 sets of write permissions in apache svn ofbiz
> (all) and ofbiz-apps.
> ofbiz=adrianc,apatel,bibryam,byersa,chrisg,doogie,hansbak,jacopoc,jaz,jonesde,sichen,lektran,jleroux
> ofbiz-apps=rayb,ruppert,eckardjf,mrisaliti,ashish,mor,buscob
>
> And if you give access to root you automatically give access to all (maybe there are other complicated solutions dealing with
> permissions below root; but anyway I'm sure we don't want such complications and anwyay would not be allowed by infra)
> So at this stage one solution I see is to give access to all to ashish and mor who are very active these last times... :o). Of
> course this would need 2 PMC votes...
> We may also ignore these changes until Ashish and Vikas get the right but of course then the repos will not be updated before they
> have commit right on all.
> Actually it's already the case and nobody seems to complain so far...
>
> Souns like a complicated post for a small thing isn'it ?
>
> Jacques
>
> From: "Vikas Mayur" <vi...@hotwaxmedia.com>
>> Even I am not sure of svnmergeinfo advantages but just come to know why it is used when Ashish shared this information :)
>>
>> I think with my limited knowledge on svn I cannot comment on whether it is a useful or necessary.
>>
>> Vikas
>>
>> On May 21, 2009, at 3:24 PM, Scott Gray wrote:
>>
>>> Thanks for the info Ashish, it all kind of falls into the advanced svn category for me and I don't really have the desire to
>>> understand it :-)
>>>
>>> But like I said to Vikas, if you guys think it is useful or necessary I'm happy to follow along.
>>>
>>> Regards
>>> Scott
>>>
>>> On 21/05/2009, at 9:25 PM, Ashish Vijaywargiya wrote:
>>>
>>>> AFAIK the use of maintaining the svn:mergeinfo is encouraged by subversion project after release 1.5.
>>>> This is actually required when you maintain such release branch and that takes update from trunk.
>>>> (As I remembered that something similar is commented by Jacuqes in past, But I could be wrong.)
>>>>
>>>> Sharing the link that can provide more insight: http://subversion.tigris.org/merge-tracking/func-spec.html
>>>> Although I haven't read full details but certainly will read it in a day or so.
>>>>
>>>> Let see what Jacques has to say about it.
>>>>
>>>> --
>>>> Ashish
>>>>
>>>> Scott Gray wrote:
>>>>> Sorry if this is an svn noob question, but what's so great about this mergeinfo file that it's worth the extra effort anyway?
>>>>>
>>>>> Thanks
>>>>> Scott
>>>>>
>>>>> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>>>>>
>>>>>> Hello Jacques,
>>>>>>
>>>>>> As we all know that we are maintaining the details of revision (trunk revision details that we apply to RB9.04) in the
>>>>>> svn:mergeinfo file.
>>>>>> But certainly we(Me, Vikas and few others don't have framework and OFBiz root files / folder write access) don't have commit
>>>>>> right for that file so most of the time we leave that file as it is.
>>>>>> And wait for someone like you to commit the changes later on.
>>>>>>
>>>>>> What can be the better solution to handle this ?
>>>>>> Is it good that we commit the code in release branch and explicitly inform to commit the changes in svn:mergeinfo file ?
>>>>>>
>>>>>> Please let me know your thoughts on this, as your comment on this will help us not to miss any version info from
>>>>>> svn:mergeinfo file after committing the code.
>>>>>> Thanks !
>>>>>>
>>>>>> --
>>>>>> Ashish
>>>>>>
>>>>>
>>>
>>
>>
>
>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Jacques Le Roux <ja...@les7arts.com>.
Official documentation http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge.basicmerging.mergeinfo
Unofficial but complementary (and translated in French :o)
http://www.framalang.org/wiki/SVNBOOK_Chap4_Branching_and_Merging_Basic_Merging_Mergeinfo_and_Previews
And even more complete http://www.open.collab.net/community/subversion/articles/merge-info.html (for tough readers :D)
Yes, as you can see it's only about keeping tracks on merge, so it's useful but not necessary.
This may prove useful for people willing to integrate some parts.
I don't see any means to ignore merge-info, so a solution would be to allow all commiters to have write access on this.
But (as it's explained above) it's a property of root (ie ".") and we have only 2 sets of write permissions in apache svn ofbiz
(all) and ofbiz-apps.
ofbiz=adrianc,apatel,bibryam,byersa,chrisg,doogie,hansbak,jacopoc,jaz,jonesde,sichen,lektran,jleroux
ofbiz-apps=rayb,ruppert,eckardjf,mrisaliti,ashish,mor,buscob
And if you give access to root you automatically give access to all (maybe there are other complicated solutions dealing with
permissions below root; but anyway I'm sure we don't want such complications and anwyay would not be allowed by infra)
So at this stage one solution I see is to give access to all to ashish and mor who are very active these last times... :o). Of
course this would need 2 PMC votes...
We may also ignore these changes until Ashish and Vikas get the right but of course then the repos will not be updated before they
have commit right on all.
Actually it's already the case and nobody seems to complain so far...
Souns like a complicated post for a small thing isn'it ?
Jacques
From: "Vikas Mayur" <vi...@hotwaxmedia.com>
> Even I am not sure of svnmergeinfo advantages but just come to know why it is used when Ashish shared this information :)
>
> I think with my limited knowledge on svn I cannot comment on whether it is a useful or necessary.
>
> Vikas
>
> On May 21, 2009, at 3:24 PM, Scott Gray wrote:
>
>> Thanks for the info Ashish, it all kind of falls into the advanced svn category for me and I don't really have the desire to
>> understand it :-)
>>
>> But like I said to Vikas, if you guys think it is useful or necessary I'm happy to follow along.
>>
>> Regards
>> Scott
>>
>> On 21/05/2009, at 9:25 PM, Ashish Vijaywargiya wrote:
>>
>>> AFAIK the use of maintaining the svn:mergeinfo is encouraged by subversion project after release 1.5.
>>> This is actually required when you maintain such release branch and that takes update from trunk.
>>> (As I remembered that something similar is commented by Jacuqes in past, But I could be wrong.)
>>>
>>> Sharing the link that can provide more insight: http://subversion.tigris.org/merge-tracking/func-spec.html
>>> Although I haven't read full details but certainly will read it in a day or so.
>>>
>>> Let see what Jacques has to say about it.
>>>
>>> --
>>> Ashish
>>>
>>> Scott Gray wrote:
>>>> Sorry if this is an svn noob question, but what's so great about this mergeinfo file that it's worth the extra effort anyway?
>>>>
>>>> Thanks
>>>> Scott
>>>>
>>>> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>>>>
>>>>> Hello Jacques,
>>>>>
>>>>> As we all know that we are maintaining the details of revision (trunk revision details that we apply to RB9.04) in the
>>>>> svn:mergeinfo file.
>>>>> But certainly we(Me, Vikas and few others don't have framework and OFBiz root files / folder write access) don't have commit
>>>>> right for that file so most of the time we leave that file as it is.
>>>>> And wait for someone like you to commit the changes later on.
>>>>>
>>>>> What can be the better solution to handle this ?
>>>>> Is it good that we commit the code in release branch and explicitly inform to commit the changes in svn:mergeinfo file ?
>>>>>
>>>>> Please let me know your thoughts on this, as your comment on this will help us not to miss any version info from
>>>>> svn:mergeinfo file after committing the code.
>>>>> Thanks !
>>>>>
>>>>> --
>>>>> Ashish
>>>>>
>>>>
>>
>
>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Vikas Mayur <vi...@hotwaxmedia.com>.
Even I am not sure of svnmergeinfo advantages but just come to know
why it is used when Ashish shared this information :)
I think with my limited knowledge on svn I cannot comment on whether
it is a useful or necessary.
Vikas
On May 21, 2009, at 3:24 PM, Scott Gray wrote:
> Thanks for the info Ashish, it all kind of falls into the advanced
> svn category for me and I don't really have the desire to understand
> it :-)
>
> But like I said to Vikas, if you guys think it is useful or
> necessary I'm happy to follow along.
>
> Regards
> Scott
>
> On 21/05/2009, at 9:25 PM, Ashish Vijaywargiya wrote:
>
>> AFAIK the use of maintaining the svn:mergeinfo is encouraged by
>> subversion project after release 1.5.
>> This is actually required when you maintain such release branch and
>> that takes update from trunk.
>> (As I remembered that something similar is commented by Jacuqes in
>> past, But I could be wrong.)
>>
>> Sharing the link that can provide more insight: http://subversion.tigris.org/merge-tracking/func-spec.html
>> Although I haven't read full details but certainly will read it in
>> a day or so.
>>
>> Let see what Jacques has to say about it.
>>
>> --
>> Ashish
>>
>> Scott Gray wrote:
>>> Sorry if this is an svn noob question, but what's so great about
>>> this mergeinfo file that it's worth the extra effort anyway?
>>>
>>> Thanks
>>> Scott
>>>
>>> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>>>
>>>> Hello Jacques,
>>>>
>>>> As we all know that we are maintaining the details of revision
>>>> (trunk revision details that we apply to RB9.04) in the
>>>> svn:mergeinfo file.
>>>> But certainly we(Me, Vikas and few others don't have framework
>>>> and OFBiz root files / folder write access) don't have commit
>>>> right for that file so most of the time we leave that file as it
>>>> is.
>>>> And wait for someone like you to commit the changes later on.
>>>>
>>>> What can be the better solution to handle this ?
>>>> Is it good that we commit the code in release branch and
>>>> explicitly inform to commit the changes in svn:mergeinfo file ?
>>>>
>>>> Please let me know your thoughts on this, as your comment on this
>>>> will help us not to miss any version info from svn:mergeinfo file
>>>> after committing the code.
>>>> Thanks !
>>>>
>>>> --
>>>> Ashish
>>>>
>>>
>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Ashish Vijaywargiya <vi...@gmail.com>.
>>But like I said to Vikas, if you guys think it is useful or necessary I'm
happy to follow along.
Jacques, is the right man to comment on this.
Please wait for him to comment .... I am surprised why this time we didn't
see his reply since last one hour or so ;o).
--
Ashish
On Thu, May 21, 2009 at 3:24 PM, Scott Gray <sc...@hotwaxmedia.com>wrote:
> Thanks for the info Ashish, it all kind of falls into the advanced svn
> category for me and I don't really have the desire to understand it :-)
>
> But like I said to Vikas, if you guys think it is useful or necessary I'm
> happy to follow along.
>
> Regards
> Scott
>
>
Re: Unable to commit changes from svn:mergeinfo file
Posted by Scott Gray <sc...@hotwaxmedia.com>.
Thanks for the info Ashish, it all kind of falls into the advanced svn
category for me and I don't really have the desire to understand it :-)
But like I said to Vikas, if you guys think it is useful or necessary
I'm happy to follow along.
Regards
Scott
On 21/05/2009, at 9:25 PM, Ashish Vijaywargiya wrote:
> AFAIK the use of maintaining the svn:mergeinfo is encouraged by
> subversion project after release 1.5.
> This is actually required when you maintain such release branch and
> that takes update from trunk.
> (As I remembered that something similar is commented by Jacuqes in
> past, But I could be wrong.)
>
> Sharing the link that can provide more insight: http://subversion.tigris.org/merge-tracking/func-spec.html
> Although I haven't read full details but certainly will read it in a
> day or so.
>
> Let see what Jacques has to say about it.
>
> --
> Ashish
>
> Scott Gray wrote:
>> Sorry if this is an svn noob question, but what's so great about
>> this mergeinfo file that it's worth the extra effort anyway?
>>
>> Thanks
>> Scott
>>
>> On 21/05/2009, at 9:05 PM, Ashish Vijaywargiya wrote:
>>
>>> Hello Jacques,
>>>
>>> As we all know that we are maintaining the details of revision
>>> (trunk revision details that we apply to RB9.04) in the
>>> svn:mergeinfo file.
>>> But certainly we(Me, Vikas and few others don't have framework and
>>> OFBiz root files / folder write access) don't have commit right
>>> for that file so most of the time we leave that file as it is.
>>> And wait for someone like you to commit the changes later on.
>>>
>>> What can be the better solution to handle this ?
>>> Is it good that we commit the code in release branch and
>>> explicitly inform to commit the changes in svn:mergeinfo file ?
>>>
>>> Please let me know your thoughts on this, as your comment on this
>>> will help us not to miss any version info from svn:mergeinfo file
>>> after committing the code.
>>> Thanks !
>>>
>>> --
>>> Ashish
>>>
>>