Vikrant, Are you aware of those documents ? http://docs.ofbiz.org/x/8gI http://docs.ofbiz.org/x/l
Anyway, a good page to put you document should be http://docs.ofbiz.org/x/kg Thanks Jacques > Hi Vikrant, > > A published document about your merging strategy should be very > interesting for sure ! > For the moment I use a simple one (dealing with Opentaps components as > well) but yes it begin being more complex with now branches in OFBiz and > current changes in Opentaps. > > Thanks for sharing > > Jacques > > > > > Hi Jacques, > > > > If you know Opentaps has its own SVN repository, ofbiz has its own > repository. On top of that opentaps indeed has different repository for > its components. So it was getting very hard for me to keep and merge all > the upstream changes to my trunk as you know ofbiz needs to be merged > with trunk. The financials and crm resides in hot-deploy/financials and > hot-deploy/crmsfa. So the merge from opentaps should be on > hot-deploy/financials and hot-deploy/crmsfa so I used SVK (I already use > their product RT, its acquired by Best Practical) on top of subversion > and build a automated script which would do the work of merging the > upstream with my local changes preserving the comments and updates from > the upstream sources. > > > > Indeed I am planning on writing a full document describing this should > be ready by monday and would publish it for everyone. I think this > problem is not my own specific but with everyone who is working on > opensource projects. > > > > Thanks > > with best regards, > > Vikrant > > > > > > -----Original Message----- > > From: Jacques Le Roux [mailto:[EMAIL PROTECTED] > > Sent: Thursday, April 26, 2007 9:22 PM > > To: user@ofbiz.apache.org > > Subject: Re: Branch Release 4.0 > > > > Vikrant, > > > > Out of subject and just by curiosity. > > Which distributed version control are you using on top of subversion ? > > > > Thanks > > > > Jacques > > > > De : <[EMAIL PROTECTED]> > > > Hi David, > > > > > > To be precise my SVN structure is like this currently > > > > > > tags > > > branches > > > trunk > > > trunk/hot-deploy/crmsfa > > > trunk/hot-deploy/financials > > > trunk/hot-deploy/warehouse > > > trunk/hot-deploy/opentaps-common > > > upstream/ofbiz > > > upstream/crmsfa > > > upstream/financials > > > upstream/ warehouse > > > upstream/opentaps-common > > > > > > Now all the upstream branches gets automatic updates from the > > respective source repository with all the comments and commits. This > is an automated process and the upstream branches are exact replica of > the ofbiz and other subversion repository including the comments and > commits. > > > > > > Then there is an automated process to incrementally do a smart merge > > from upstream to trunk. Then we checkout the trunk on our development > and test environment to do ant run-install. > > > > > > This way I keep all the upstream changes along with my local > changes. > > > > > > Currently we were looking for a stable base to do a large > development > > and this is the reason raised this question. Indeed when we start > developing we would branch the trunk to our own 1.0.0 version and then > start working on it. > > > > > > Thanks > > > with best regards, > > > Vikrant > > > > > > > > > -----Original Message----- > > > From: David E. Jones [mailto:[EMAIL PROTECTED] > > > Sent: Wednesday, April 25, 2007 3:16 PM > > > To: user@ofbiz.apache.org > > > Subject: Re: Branch Release 4.0 > > > > > > > > > The release branch for 4.0 was created yesterday. This is only the > > initial branch and it has not been stabilized or tested and found > fully ready. > > > > > > For information on whether or not you should use it, please look at > > this resource: > > > > > > http://docs.ofbiz.org/display/OFBADMIN/Apache+OFBiz+Getting+Started > > > > > > -David > > > > > > > > > On Apr 24, 2007, at 11:57 PM, <[EMAIL PROTECTED]> > > > <[EMAIL PROTECTED]> wrote: > > > > > > > Hi David, > > > > > > > > Recently was browsing the SVN repository of ofbiz and found a new > > > > branch of 4.0. Currently I am working out of trunk. So anyone in > > > > community would suggest whether I should go ahead and continue to > > use > > > > trunk or change to branch 4.0. Since my current repository > structure > > > > is exact replica of ofbiz with additional modules from opentaps > for > > > > CRM and financials. > > > > > > > > I am using a distributed version control on top of subversion to > > keep > > > > track of merge and branching. > > > > > > > > Thanks > > > > with best regards, > > > > Vikrant > > > > > > > > > > > > No virus found in this outgoing message. > > > > Checked by AVG Free Edition. > > > > Version: 7.5.463 / Virus Database: 269.6.0/775 - Release Date: > > > > 4/24/2007 5:43 PM > > > > > > > > > > > > > No virus found in this incoming message. > > > Checked by AVG Free Edition. > > > Version: 7.5.463 / Virus Database: 269.6.0/775 - Release Date: > > 4/24/2007 5:43 PM > > > > > > > > > No virus found in this outgoing message. > > > Checked by AVG Free Edition. > > > Version: 7.5.463 / Virus Database: 269.6.0/775 - Release Date: > > 4/24/2007 5:43 PM > > > > > > > > > No virus found in this incoming message. > > Checked by AVG Free Edition. > > Version: 7.5.463 / Virus Database: 269.6.1/777 - Release Date: > 4/26/2007 3:23 PM > > > > > > No virus found in this outgoing message. > > Checked by AVG Free Edition. > > Version: 7.5.463 / Virus Database: 269.6.1/777 - Release Date: > 4/26/2007 3:23 PM > >
