Administrator
|
Hi,
I wonder why following fixes have not been merged from the trunk in release4.0 ? It begins when Scott stopped to do it systematically (19 july) thru 1 august included. I Will do remains later... David's http://svn.apache.org/viewvc?view=rev&rev=557899 http://svn.apache.org/viewvc?view=rev&rev=561457 http://svn.apache.org/viewvc?view=rev&rev=561701 Jacopo's http://svn.apache.org/viewvc?view=rev&rev=557911 http://svn.apache.org/viewvc?view=rev&rev=561759 http://svn.apache.org/viewvc?view=rev&rev=561858 Anil's http://svn.apache.org/viewvc?view=rev&rev=559026 Si's http://svn.apache.org/viewvc?view=rev&rev=559934 This may be out of subject since I found myself lost sometimes. I found that some changes I tried to merge were actually changes on new features or improvements. Scott did really a great job previously ! I will be happy to merge relevant ones Thanks Jacques |
Jacques Le Roux wrote: > David's > http://svn.apache.org/viewvc?view=rev&rev=557899 > http://svn.apache.org/viewvc?view=rev&rev=561457 > http://svn.apache.org/viewvc?view=rev&rev=561701 These could all go into the branch, but some of these are fixes on newer code and may not be problems in the branch... Still, I guess if the merges succeed then it's fine for now. -David |
Administrator
|
Thanks David,
Done for 557899 and 561701. For 561457 I get : D:\workspace\ofbizRelease4.0>svn merge -r 561456:561457 https://svn.apache.org/repos/asf/ofbiz/trunk U applications\accounting\src\org\ofbiz\accounting\finaccount\FinAccountPaymentServices.java D:\workspace\ofbizRelease4.0>svn commit -m "Applied fix from trunk for revision: 561457" but no real commit. Did not look further for now Jacques De : "David E Jones" <[hidden email]> > > > Jacques Le Roux wrote: > > David's > > http://svn.apache.org/viewvc?view=rev&rev=557899 > > http://svn.apache.org/viewvc?view=rev&rev=561457 > > http://svn.apache.org/viewvc?view=rev&rev=561701 > > These could all go into the branch, but some of these are fixes on newer code and may not be problems in the branch... > > Still, I guess if the merges succeed then it's fine for now. > > -David |
Just looked into that. Looks like that one is already in place. -David Jacques Le Roux wrote: > Thanks David, > > Done for 557899 and 561701. > > For 561457 I get : > > D:\workspace\ofbizRelease4.0>svn merge -r 561456:561457 https://svn.apache.org/repos/asf/ofbiz/trunk > U applications\accounting\src\org\ofbiz\accounting\finaccount\FinAccountPaymentServices.java > > D:\workspace\ofbizRelease4.0>svn commit -m "Applied fix from trunk for revision: 561457" > > but no real commit. Did not look further for now > > Jacques > > De : "David E Jones" <[hidden email]> >> >> Jacques Le Roux wrote: >>> David's >>> http://svn.apache.org/viewvc?view=rev&rev=557899 >>> http://svn.apache.org/viewvc?view=rev&rev=561457 >>> http://svn.apache.org/viewvc?view=rev&rev=561701 >> These could all go into the branch, but some of these are fixes on newer code and may not be problems in the branch... >> >> Still, I guess if the merges succeed then it's fine for now. >> >> -David |
Administrator
|
Thanks for your help David,
Jacques De : "David E Jones" <[hidden email]> > > Just looked into that. Looks like that one is already in place. > > -David > > > Jacques Le Roux wrote: > > Thanks David, > > > > Done for 557899 and 561701. > > > > For 561457 I get : > > > > D:\workspace\ofbizRelease4.0>svn merge -r 561456:561457 https://svn.apache.org/repos/asf/ofbiz/trunk > > U applications\accounting\src\org\ofbiz\accounting\finaccount\FinAccountPaymentServices.java > > > > D:\workspace\ofbizRelease4.0>svn commit -m "Applied fix from trunk for revision: 561457" > > > > but no real commit. Did not look further for now > > > > Jacques > > > > De : "David E Jones" <[hidden email]> > >> > >> Jacques Le Roux wrote: > >>> David's > >>> http://svn.apache.org/viewvc?view=rev&rev=557899 > >>> http://svn.apache.org/viewvc?view=rev&rev=561457 > >>> http://svn.apache.org/viewvc?view=rev&rev=561701 > >> These could all go into the branch, but some of these are fixes on newer code and may not be problems in the branch... > >> > >> Still, I guess if the merges succeed then it's fine for now. > >> > >> -David > |
Administrator
|
In reply to this post by Jacques Le Roux
Those are done, I will continue later...
Jacques De : "Jacques Le Roux" <[hidden email]> > Hi, > > I wonder why following fixes have not been merged from the trunk in release4.0 ? It begins when Scott stopped to do it systematically (19 july) thru 1 august included. I Will do remains later... > > David's > http://svn.apache.org/viewvc?view=rev&rev=557899 > http://svn.apache.org/viewvc?view=rev&rev=561457 > http://svn.apache.org/viewvc?view=rev&rev=561701 > > > Jacopo's > http://svn.apache.org/viewvc?view=rev&rev=557911 > http://svn.apache.org/viewvc?view=rev&rev=561759 > http://svn.apache.org/viewvc?view=rev&rev=561858 > > > Anil's > http://svn.apache.org/viewvc?view=rev&rev=559026 > > Si's > http://svn.apache.org/viewvc?view=rev&rev=559934 > > > This may be out of subject since I found myself lost sometimes. I found that some changes I tried to merge were actually changes > > I will be happy to merge relevant ones > > Thanks > > Jacques > |
Administrator
|
Now up to 10 aug ok (not included). This message mainly as a reminder to me.
Jacques De : "Jacques Le Roux" <[hidden email]> > Those are done, I will continue later... > > Jacques > > De : "Jacques Le Roux" <[hidden email]> > > Hi, > > > > I wonder why following fixes have not been merged from the trunk in release4.0 ? It begins when Scott stopped to do it > systematically (19 july) thru 1 august included. I Will do remains later... > > > > David's > > http://svn.apache.org/viewvc?view=rev&rev=557899 > > http://svn.apache.org/viewvc?view=rev&rev=561457 > > http://svn.apache.org/viewvc?view=rev&rev=561701 > > > > > > Jacopo's > > http://svn.apache.org/viewvc?view=rev&rev=557911 > > http://svn.apache.org/viewvc?view=rev&rev=561759 > > http://svn.apache.org/viewvc?view=rev&rev=561858 > > > > > > Anil's > > http://svn.apache.org/viewvc?view=rev&rev=559026 > > > > Si's > > http://svn.apache.org/viewvc?view=rev&rev=559934 > > > > > > This may be out of subject since I found myself lost sometimes. I found that some changes I tried to merge were actually changes > on new features or improvements. Scott did really a great job previously ! > > > > I will be happy to merge relevant ones > > > > Thanks > > > > Jacques > > > |
Free forum by Nabble | Edit this page |