How do I use GIT to check out and develop customer applications?

[Robert Wynkoop]

Hello OFBiz developers.

I'm a Java Web Developer wanting to use OFBIZ.  I created a test component
and got that working with a message file.

How do I commit my source back to my own repository and still continue to
get changes from the OFBIZ repo?

What version should I be looking at?  The main
https://ofbiz.apache.org/developers.html only seems to know about V16.

Robert Wynkoop

[Victor Hernadez]

Hi Robert,

Take a look on https://ofbiz.apache.org/source-repositories.html there you
will be able to see all the source repositories, I typically use SVN access
to checkout a particular version of interest for me and then create a new /
separate Git repo from it hence a end up with a disconnected repository...
I'm not sure if any other approach could allow to you refresh you personal
repo directly from ofbiz repo in a kind of "connected" way.

In order to get an updated version I would consider a manual path: Create a
new repo pulling a newer ofbiz version + export a patch from my old repo +
apply the patches to new repo.

Alternatively your old repo could be updated applying the relevant commits
extracted from newer ofbiz versions.

Kind regards,
Victor

On Wed, Oct 30, 2019 at 10:26 AM Robert Wynkoop <[hidden email]>
wrote:

> Hello OFBiz developers.
>
> I'm a Java Web Developer wanting to use OFBIZ.  I created a test component
> and got that working with a message file.
>
> How do I commit my source back to my own repository and still continue to
> get changes from the OFBIZ repo?
>
> What version should I be looking at?  The main
> https://ofbiz.apache.org/developers.html only seems to know about V16.
>
> Robert Wynkoop
>

[Jacques Le Roux]

Hi Robert, Victor,

Note that we will "soon" move to Git. So you can expect this in a near future: https://gitbox.apache.org/

Jacques

Le 30/10/2019 à 18:12, Victor Hernández a écrit :

> Hi Robert,
>
> Take a look on https://ofbiz.apache.org/source-repositories.html there you
> will be able to see all the source repositories, I typically use SVN access
> to checkout a particular version of interest for me and then create a new /
> separate Git repo from it hence a end up with a disconnected repository...
> I'm not sure if any other approach could allow to you refresh you personal
> repo directly from ofbiz repo in a kind of "connected" way.
>
> In order to get an updated version I would consider a manual path: Create a
> new repo pulling a newer ofbiz version + export a patch from my old repo +
> apply the patches to new repo.
>
> Alternatively your old repo could be updated applying the relevant commits
> extracted from newer ofbiz versions.
>
> Kind regards,
> Victor
>
> On Wed, Oct 30, 2019 at 10:26 AM Robert Wynkoop <[hidden email]>
> wrote:
>
>> Hello OFBiz developers.
>>
>> I'm a Java Web Developer wanting to use OFBIZ.  I created a test component
>> and got that working with a message file.
>>
>> How do I commit my source back to my own repository and still continue to
>> get changes from the OFBIZ repo?
>>
>> What version should I be looking at?  The main
>> https://ofbiz.apache.org/developers.html only seems to know about V16.
>>
>> Robert Wynkoop
>>

[iwolf]

Hi Robert,

this is the way I do it with git:

1.) Clone ofbiz branch from https://github.com/apache/ofbiz-framework + used plugins from https://github.com/apache/ofbiz-plugins
2.) Create an additional remote to your repository
3.) Create your branch you are working on.
4.) Merge the ofbiz branch into your branch.
5.) Push your branch to your remote repository.
6.) Now and then I pull changes from the ofbiz rep into the ofbiz branch. The local ofbiz branch is now updated.
7.) Merge updated ofbiz branch into your branch ... fixing conflicts ... now your repo should be updated.

Don't know if that's what you are looking for?

Best regards,
Ingo


-----Ursprüngliche Nachricht-----
Von: Robert Wynkoop <[hidden email]>
Gesendet: Mittwoch, 30. Oktober 2019 17:16
An: OFBiz user Mailing List <[hidden email]>
Betreff: How do I use GIT to check out and develop customer applications?

Hello OFBiz developers.

I'm a Java Web Developer wanting to use OFBIZ.  I created a test component and got that working with a message file.

How do I commit my source back to my own repository and still continue to get changes from the OFBIZ repo?

What version should I be looking at?  The main https://ofbiz.apache.org/developers.html only seems to know about V16.

Robert Wynkoop

[Robert Wynkoop]

Ingo / All

Thanks for the help all.  I think I like Ingo's method will work the best
for me.  I'm comfortable working in branches.

Robert Wynkoop

On Thu, Oct 31, 2019 at 3:07 AM Ingo Wolfmayr <[hidden email]>
wrote:

> Hi Robert,
>
> this is the way I do it with git:
>
> 1.) Clone ofbiz branch from https://github.com/apache/ofbiz-framework +
> used plugins from https://github.com/apache/ofbiz-plugins
> 2.) Create an additional remote to your repository
> 3.) Create your branch you are working on.
> 4.) Merge the ofbiz branch into your branch.
> 5.) Push your branch to your remote repository.
> 6.) Now and then I pull changes from the ofbiz rep into the ofbiz branch.
> The local ofbiz branch is now updated.
> 7.) Merge updated ofbiz branch into your branch ... fixing conflicts ...
> now your repo should be updated.
>
> Don't know if that's what you are looking for?
>
> Best regards,
> Ingo
>
>
> -----Ursprüngliche Nachricht-----
> Von: Robert Wynkoop <[hidden email]>
> Gesendet: Mittwoch, 30. Oktober 2019 17:16
> An: OFBiz user Mailing List <[hidden email]>
> Betreff: How do I use GIT to check out and develop customer applications?
>
> Hello OFBiz developers.
>
> I'm a Java Web Developer wanting to use OFBIZ.  I created a test component
> and got that working with a message file.
>
> How do I commit my source back to my own repository and still continue to
> get changes from the OFBIZ repo?
>
> What version should I be looking at?  The main
> https://ofbiz.apache.org/developers.html only seems to know about V16.
>
> Robert Wynkoop
>