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 <[email protected]>
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 <
[email protected]
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" <[email protected]> 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/


Reply via email to