Commits causing conflicts

[Pierre Smits]

HI all,

Over the past few weeks I am experiencing conflicts after an svn upgrade
due to commits to build.gradle. These conflicts happen not only in my dev
environment, but also in the various CIs I have testing against trunk. Each
time this happens I lose precious time to fix all this.

Can we collaborate to get something in the code repo so that these
conflicts won't happen again?

Best regards,

Pierre Smits

ORRTIZ.COM <http://www.orrtiz.com>
OFBiz based solutions & services

OFBiz Extensions Marketplace
http://oem.ofbizci.net/oci-2/

[taher]

Hi Pierre,

We will try to minimize these issues, however this is trunk, which is by
default unstable. Having your CIs always catching the latest commit might
not be the best idea if you are trying to build solutions.

On Aug 15, 2016 8:32 PM, "Pierre Smits" <[hidden email]> wrote:

> HI all,
>
> Over the past few weeks I am experiencing conflicts after an svn upgrade
> due to commits to build.gradle. These conflicts happen not only in my dev
> environment, but also in the various CIs I have testing against trunk. Each
> time this happens I lose precious time to fix all this.
>
> Can we collaborate to get something in the code repo so that these
> conflicts won't happen again?
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>

[Pierre Smits]

Hi Taher,

I am not talking about CD, but CI. Meaning - like I said in the earlier
posting - testing against trunk.

Best regards,

Pierre Smits

ORRTIZ.COM <http://www.orrtiz.com>
OFBiz based solutions & services

OFBiz Extensions Marketplace
http://oem.ofbizci.net/oci-2/

On Mon, Aug 15, 2016 at 8:35 PM, Taher Alkhateeb <[hidden email]
> wrote:

> Hi Pierre,
>
> We will try to minimize these issues, however this is trunk, which is by
> default unstable. Having your CIs always catching the latest commit might
> not be the best idea if you are trying to build solutions.
>
> On Aug 15, 2016 8:32 PM, "Pierre Smits" <[hidden email]> wrote:
>
> > HI all,
> >
> > Over the past few weeks I am experiencing conflicts after an svn upgrade
> > due to commits to build.gradle. These conflicts happen not only in my dev
> > environment, but also in the various CIs I have testing against trunk.
> Each
> > time this happens I lose precious time to fix all this.
> >
> > Can we collaborate to get something in the code repo so that these
> > conflicts won't happen again?
> >
> > Best regards,
> >
> > Pierre Smits
> >
> > ORRTIZ.COM <http://www.orrtiz.com>
> > OFBiz based solutions & services
> >
> > OFBiz Extensions Marketplace
> > http://oem.ofbizci.net/oci-2/
> >
>

[Jacopo Cappellato-5]

If the time it takes you to resolve the conflicts due to local changes to
your build.gradle file is too much then you could automate your process by
preparing a script to revert your local changes before updating the trunk
and then re-applying them after the update:
1) revert local changes (the script could also create a patch file with
your local modification before reverting them)
2) update the trunk
3) apply your local changes (e.g. by using the patch created in step #1)

This should minimize the occurrences of conflicts, that could still happen
in step #3, and at the same time make it easier to deal with them (in step
#3).

Hope it helps,

Jacopo

On Mon, Aug 15, 2016 at 8:32 PM, Pierre Smits <[hidden email]>
wrote:

> HI all,
>
> Over the past few weeks I am experiencing conflicts after an svn upgrade
> due to commits to build.gradle. These conflicts happen not only in my dev
> environment, but also in the various CIs I have testing against trunk. Each
> time this happens I lose precious time to fix all this.
>
> Can we collaborate to get something in the code repo so that these
> conflicts won't happen again?
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>

[Jacques Le Roux]

I already told to Pierre that I have put in place a such process and it's documented at
https://cwiki.apache.org/confluence/display/OFBIZ/Addressing+Custom+Requirements+In+OFBiz#AddressingCustomRequirementsInOFBiz-Therearealso4deploymenttargetsavailableinthemainbuild.xml.

Unfortunately we have not yet migrated these Ant targets to Gradle tasks, same for createComponent targets

If it's only changes in one file it's though easy to perform the process by hand as you explained, Jacopo

Jacques


Le 16/08/2016 à 08:34, Jacopo Cappellato a écrit :

> If the time it takes you to resolve the conflicts due to local changes to
> your build.gradle file is too much then you could automate your process by
> preparing a script to revert your local changes before updating the trunk
> and then re-applying them after the update:
> 1) revert local changes (the script could also create a patch file with
> your local modification before reverting them)
> 2) update the trunk
> 3) apply your local changes (e.g. by using the patch created in step #1)
>
> This should minimize the occurrences of conflicts, that could still happen
> in step #3, and at the same time make it easier to deal with them (in step
> #3).
>
> Hope it helps,
>
> Jacopo
>
> On Mon, Aug 15, 2016 at 8:32 PM, Pierre Smits <[hidden email]>
> wrote:
>
>> HI all,
>>
>> Over the past few weeks I am experiencing conflicts after an svn upgrade
>> due to commits to build.gradle. These conflicts happen not only in my dev
>> environment, but also in the various CIs I have testing against trunk. Each
>> time this happens I lose precious time to fix all this.
>>
>> Can we collaborate to get something in the code repo so that these
>> conflicts won't happen again?
>>
>> Best regards,
>>
>> Pierre Smits
>>
>> ORRTIZ.COM <http://www.orrtiz.com>
>> OFBiz based solutions & services
>>
>> OFBiz Extensions Marketplace
>> http://oem.ofbizci.net/oci-2/
>>

[taher]

Also in addition to what Jacopo suggested, depending on the context of what
you are trying to do you can simply include an external script right at the
end of build.gradle and externalize all your work in there. For example
"echo apply from: 'my-script.gradle' >> build.gradle" or something like
that.

On Aug 16, 2016 8:35 AM, "Jacopo Cappellato" <
[hidden email]> wrote:

> If the time it takes you to resolve the conflicts due to local changes to
> your build.gradle file is too much then you could automate your process by
> preparing a script to revert your local changes before updating the trunk
> and then re-applying them after the update:
> 1) revert local changes (the script could also create a patch file with
> your local modification before reverting them)
> 2) update the trunk
> 3) apply your local changes (e.g. by using the patch created in step #1)
>
> This should minimize the occurrences of conflicts, that could still happen
> in step #3, and at the same time make it easier to deal with them (in step
> #3).
>
> Hope it helps,
>
> Jacopo
>
> On Mon, Aug 15, 2016 at 8:32 PM, Pierre Smits <[hidden email]>
> wrote:
>
> > HI all,
> >
> > Over the past few weeks I am experiencing conflicts after an svn upgrade
> > due to commits to build.gradle. These conflicts happen not only in my dev
> > environment, but also in the various CIs I have testing against trunk.
> Each
> > time this happens I lose precious time to fix all this.
> >
> > Can we collaborate to get something in the code repo so that these
> > conflicts won't happen again?
> >
> > Best regards,
> >
> > Pierre Smits
> >
> > ORRTIZ.COM <http://www.orrtiz.com>
> > OFBiz based solutions & services
> >
> > OFBiz Extensions Marketplace
> > http://oem.ofbizci.net/oci-2/
> >
>

[taher]

Hi Pierre,

I would also like to add that CD vs CI is irrelevant to my point. You would
still have an unstable trunk in both situations. The point emphasis is that
trunk is stable, not whether you're publishing or not.

Taher Alkhateeb

On Mon, Aug 15, 2016 at 9:38 PM, Pierre Smits <[hidden email]>
wrote:

> Hi Taher,
>
> I am not talking about CD, but CI. Meaning - like I said in the earlier
> posting - testing against trunk.
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>
> On Mon, Aug 15, 2016 at 8:35 PM, Taher Alkhateeb <
> [hidden email]
> > wrote:
>
> > Hi Pierre,
> >
> > We will try to minimize these issues, however this is trunk, which is by
> > default unstable. Having your CIs always catching the latest commit might
> > not be the best idea if you are trying to build solutions.
> >
> > On Aug 15, 2016 8:32 PM, "Pierre Smits" <[hidden email]> wrote:
> >
> > > HI all,
> > >
> > > Over the past few weeks I am experiencing conflicts after an svn
> upgrade
> > > due to commits to build.gradle. These conflicts happen not only in my
> dev
> > > environment, but also in the various CIs I have testing against trunk.
> > Each
> > > time this happens I lose precious time to fix all this.
> > >
> > > Can we collaborate to get something in the code repo so that these
> > > conflicts won't happen again?
> > >
> > > Best regards,
> > >
> > > Pierre Smits
> > >
> > > ORRTIZ.COM <http://www.orrtiz.com>
> > > OFBiz based solutions & services
> > >
> > > OFBiz Extensions Marketplace
> > > http://oem.ofbizci.net/oci-2/
> > >
> >
>

[Nicolas Malin-2]

Pierre I think you workflow on your CI would be improve because I can't
understand why a svn up create a conflit only on regular change.

The conflit can appear only when you have local change and like taher
suggestn you need first update your ofbiz from a clean official copy and
after that deploy you change.

For us we win most time to use the git repository instead of the svn
repo to realize this.

Nicolas

Le 17/08/2016 à 21:55, Taher Alkhateeb a écrit :

> Hi Pierre,
>
> I would also like to add that CD vs CI is irrelevant to my point. You would
> still have an unstable trunk in both situations. The point emphasis is that
> trunk is stable, not whether you're publishing or not.
>
> Taher Alkhateeb
>
> On Mon, Aug 15, 2016 at 9:38 PM, Pierre Smits <[hidden email]>
> wrote:
>
>> Hi Taher,
>>
>> I am not talking about CD, but CI. Meaning - like I said in the earlier
>> posting - testing against trunk.
>>
>> Best regards,
>>
>> Pierre Smits
>>
>> ORRTIZ.COM <http://www.orrtiz.com>
>> OFBiz based solutions & services
>>
>> OFBiz Extensions Marketplace
>> http://oem.ofbizci.net/oci-2/
>>
>> On Mon, Aug 15, 2016 at 8:35 PM, Taher Alkhateeb <
>> [hidden email]
>>> wrote:
>>> Hi Pierre,
>>>
>>> We will try to minimize these issues, however this is trunk, which is by
>>> default unstable. Having your CIs always catching the latest commit might
>>> not be the best idea if you are trying to build solutions.
>>>
>>> On Aug 15, 2016 8:32 PM, "Pierre Smits" <[hidden email]> wrote:
>>>
>>>> HI all,
>>>>
>>>> Over the past few weeks I am experiencing conflicts after an svn
>> upgrade
>>>> due to commits to build.gradle. These conflicts happen not only in my
>> dev
>>>> environment, but also in the various CIs I have testing against trunk.
>>> Each
>>>> time this happens I lose precious time to fix all this.
>>>>
>>>> Can we collaborate to get something in the code repo so that these
>>>> conflicts won't happen again?
>>>>
>>>> Best regards,
>>>>
>>>> Pierre Smits
>>>>
>>>> ORRTIZ.COM <http://www.orrtiz.com>
>>>> OFBiz based solutions & services
>>>>
>>>> OFBiz Extensions Marketplace
>>>> http://oem.ofbizci.net/oci-2/
>>>>