You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Mathieu Lirzin <ma...@nereide.fr> on 2019/10/17 14:10:25 UTC
Migrating to Git
Now that the Git synchro is working again, I think it would be great if
we could move forward regarding the SVN to Git migration.
I am not sure what needs be done to achieve such result, is it just a
matter of opening a INFRA ticket on Jira? What can I do to help?
Thanks.
--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
Re: Migrating to Git
Posted by Deepak Dixit <de...@apache.org>.
Here is the task for svn to git migration post actions
https://issues.apache.org/jira/browse/OFBIZ-11268
Thanks & Regards
--
Deepak Dixit
ofbiz.apache.org
On Mon, Nov 4, 2019 at 11:36 AM Deepak Dixit <de...@apache.org> wrote:
> I think we can create ticket to track all the migration steps. It will
> help to cross check and for future reference
>
>
> Thanks & Regards
> --
> Deepak Dixit
> ofbiz.apache.org
>
>
> On Mon, Nov 4, 2019 at 12:46 AM Jacques Le Roux <
> jacques.le.roux@les7arts.com> wrote:
>
>> Le 03/11/2019 à 18:58, Jacques Le Roux a écrit :
>> > Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
>> >> we have no Git repo for 16.11. I guess the repo is not read only and
>> we can continue to use it. But anyway, then backporting will be come
>> >> harder...
>> > Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
>>
>> OK, missed that all Buildbot servers are offline :/ Wait for it...
>>
>> Jacques
>>
>>
Re: Migrating to Git
Posted by Deepak Dixit <de...@apache.org>.
I think we can create ticket to track all the migration steps. It will help
to cross check and for future reference
Thanks & Regards
--
Deepak Dixit
ofbiz.apache.org
On Mon, Nov 4, 2019 at 12:46 AM Jacques Le Roux <
jacques.le.roux@les7arts.com> wrote:
> Le 03/11/2019 à 18:58, Jacques Le Roux a écrit :
> > Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
> >> we have no Git repo for 16.11. I guess the repo is not read only and we
> can continue to use it. But anyway, then backporting will be come
> >> harder...
> > Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
>
> OK, missed that all Buildbot servers are offline :/ Wait for it...
>
> Jacques
>
>
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
Forgot: done with OFBIZ-11270 :)
Le 04/11/2019 à 10:56, Jacques Le Roux a écrit :
> All is OK but RAT, maybe a simple typo... I'll check, hopefully fix, else will create a Jira under OFBIZ-11268
>
> Jacquesd
>
> Le 03/11/2019 à 20:15, Jacques Le Roux a écrit :
>> Le 03/11/2019 à 18:58, Jacques Le Roux a écrit :
>>> Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
>>>> we have no Git repo for 16.11. I guess the repo is not read only and we can continue to use it. But anyway, then backporting will be come
>>>> harder...
>>> Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
>>
>> OK, missed that all Buildbot servers are offline :/ Wait for it...
>>
>> Jacques
>>
>>
>
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
All is OK but RAT, maybe a simple typo... I'll check, hopefully fix, else will create a Jira under OFBIZ-11268
Jacquesd
Le 03/11/2019 à 20:15, Jacques Le Roux a écrit :
> Le 03/11/2019 à 18:58, Jacques Le Roux a écrit :
>> Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
>>> we have no Git repo for 16.11. I guess the repo is not read only and we can continue to use it. But anyway, then backporting will be come
>>> harder...
>> Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
>
> OK, missed that all Buildbot servers are offline :/ Wait for it...
>
> Jacques
>
>
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
Le 03/11/2019 à 18:58, Jacques Le Roux a écrit :
> Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
>> we have no Git repo for 16.11. I guess the repo is not read only and we can continue to use it. But anyway, then backporting will be come
>> harder...
> Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
OK, missed that all Buildbot servers are offline :/ Wait for it...
Jacques
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
Le 03/11/2019 à 18:29, Jacques Le Roux a écrit :
> we have no Git repo for 16.11. I guess the repo is not read only and we can continue to use it. But anyway, then backporting will be come
> harder...
Is the repo read-only https://ci.apache.org/builders/ofbizBranch16 ?
Jacques
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
Le 03/11/2019 à 12:06, Jacques Le Roux a écrit :
> 1. I'll change the Buildbot config
Just had a look, most is easy. There are though 2 issues:
1. we have no Git repo for 16.11. I guess the repo is not read only and we can continue to use it. But anyway, then backporting will be come
harder...
2. We used svn export to grab rat-excludes.txt from tools and use it in the build. I don't see any equivalent for Git. I'll ask Infra if they
know a solution
Jacques
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi All,
Thanks all for the good work and this page: https://cwiki.apache.org/confluence/display/OFBIZ/Migration+from+Subversion+%28SVN%29+to+Git. I guess we
can remove the comments once all is done.
I also think we should right now remove this line
"The above workflow can also adhere to the now famous Vincent Driessen git branching model found here..."
See below about workflow.
As ever, the devil is in the details, and we know there are much "details" when it comes to Git[1] ;)
More seriously, I was looking on how to modify some scripts in tools.
Revert seems easy[2][3]. As long as you are not pushing you can do what you want locally. So I think we can agree about changing revert scripts to the
simplest form and let people handle details themselves. Aditya added a comment[4] about that.
There is more work withbackporting the fixes (mergefrom scripts). We need 1st to agree about a default revert workflow: cherry pick or merge?[5].
Cherry pick seems OK since we mostly backport fixes. But surprises may come when backporting features? Also what about the commit message? Should I'll
wait a decision before going ahead?
About the global workflow, we maybe don't need to make things complex and what Taher proposed is enough[6]. Else this recent article[7] is a good
summary to discuss and pick/adapt a workflow. This will maybe surge in time maybe better to address it before, if we have ideas...
Now,
1. I'll change the Buildbot config
2. I'll will look at line endings per repository[8] and get back to you before any change.
BTW, should this Mathieu's concern[9] been addressed?
Thanks
Jacques
[1] https://git-man-page-generator.lokaltog.net/ (sorry could not resist, happy Git goggling)
[2] https://s.apache.org/f3610
[3] https://git-scm.com/docs/git-revert
[4] https://s.apache.org/gsgp7
[5] https://stackoverflow.com/questions/1241720/git-cherry-pick-vs-merge-workflow
[6] https://medium.com/@patrickporto/4-branching-workflows-for-git-30d0aaee7bf
[7] https://s.apache.org/cogvj
[8] https://s.apache.org/gz5p0
[9] https://markmail.org/message/aqorzx4s2xhirb6u
Le 01/11/2019 à 19:56, Deepak Dixit a écrit :
> Just to update you all we are done with git migration.
>
> @all committers
> Please use gitbox repo for code commit, as ofbiz svn location is locked.
> Here are the list of repositories url:
>
> - https://gitbox.apache.org/repos/asf/ofbiz-framework.git
> - https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
> - https://gitbox.apache.org/repos/asf/ofbiz-site.git
> - https://gitbox.apache.org/repos/asf/ofbiz-tools.git
>
> Will proceed with migration steps one by one.
>
> Please refer following task for more detail
> https://issues.apache.org/jira/browse/INFRA-19308
> Thanks & Regards
> --
> Deepak Dixit
> ofbiz.apache.org
>
>
> On Mon, Oct 21, 2019 at 2:13 PM Jacopo Cappellato <
> jacopo.cappellato@gmail.com> wrote:
>
>> On Sat, Oct 19, 2019 at 5:31 PM Mathieu Lirzin <ma...@nereide.fr>
>> wrote:
>>
>>> Hello,
>>>
>>> Swapnil M Mane <sw...@apache.org> writes:
>>>
>>>> As discussed previously, all the essential details are incorporated in
>>> this
>>>> document [1] to help us in migrating from SVN to Git.
>>>> Please have a look and let us know your kind feedback/thoughts.
>>>> Here are references [2] [3] to our previous discussions for your quick
>>>> reference.
>>> Thanks for thise reminder, I think this workflow document is
>>> sufficiently well thought to move forward. I have open the following
>>> ticket:
>>>
>>> https://issues.apache.org/jira/browse/INFRA-19308
>>>
>>> Thanks.
>>>
>>> --
>>> Mathieu Lirzin
>>> GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
>>>
>> Great!
>>
>> Jacopo
>>
Re: Migrating to Git
Posted by Deepak Dixit <de...@apache.org>.
Just to update you all we are done with git migration.
@all committers
Please use gitbox repo for code commit, as ofbiz svn location is locked.
Here are the list of repositories url:
- https://gitbox.apache.org/repos/asf/ofbiz-framework.git
- https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
- https://gitbox.apache.org/repos/asf/ofbiz-site.git
- https://gitbox.apache.org/repos/asf/ofbiz-tools.git
Will proceed with migration steps one by one.
Please refer following task for more detail
https://issues.apache.org/jira/browse/INFRA-19308
Thanks & Regards
--
Deepak Dixit
ofbiz.apache.org
On Mon, Oct 21, 2019 at 2:13 PM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> On Sat, Oct 19, 2019 at 5:31 PM Mathieu Lirzin <ma...@nereide.fr>
> wrote:
>
> > Hello,
> >
> > Swapnil M Mane <sw...@apache.org> writes:
> >
> > > As discussed previously, all the essential details are incorporated in
> > this
> > > document [1] to help us in migrating from SVN to Git.
> > > Please have a look and let us know your kind feedback/thoughts.
> > > Here are references [2] [3] to our previous discussions for your quick
> > > reference.
> >
> > Thanks for thise reminder, I think this workflow document is
> > sufficiently well thought to move forward. I have open the following
> > ticket:
> >
> > https://issues.apache.org/jira/browse/INFRA-19308
> >
> > Thanks.
> >
> > --
> > Mathieu Lirzin
> > GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
> >
>
> Great!
>
> Jacopo
>
Re: Migrating to Git
Posted by Jacopo Cappellato <ja...@gmail.com>.
On Sat, Oct 19, 2019 at 5:31 PM Mathieu Lirzin <ma...@nereide.fr>
wrote:
> Hello,
>
> Swapnil M Mane <sw...@apache.org> writes:
>
> > As discussed previously, all the essential details are incorporated in
> this
> > document [1] to help us in migrating from SVN to Git.
> > Please have a look and let us know your kind feedback/thoughts.
> > Here are references [2] [3] to our previous discussions for your quick
> > reference.
>
> Thanks for thise reminder, I think this workflow document is
> sufficiently well thought to move forward. I have open the following
> ticket:
>
> https://issues.apache.org/jira/browse/INFRA-19308
>
> Thanks.
>
> --
> Mathieu Lirzin
> GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
>
Great!
Jacopo
Re: Migrating to Git
Posted by Mathieu Lirzin <ma...@nereide.fr>.
Hello,
Swapnil M Mane <sw...@apache.org> writes:
> As discussed previously, all the essential details are incorporated in this
> document [1] to help us in migrating from SVN to Git.
> Please have a look and let us know your kind feedback/thoughts.
> Here are references [2] [3] to our previous discussions for your quick
> reference.
Thanks for thise reminder, I think this workflow document is
sufficiently well thought to move forward. I have open the following
ticket:
https://issues.apache.org/jira/browse/INFRA-19308
Thanks.
--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
Re: Migrating to Git
Posted by Swapnil M Mane <sw...@apache.org>.
Thank you Deepak for the notes.
Team,
We are maintaining this document
https://cwiki.apache.org/confluence/x/Xg-HBg containing details to help us
in migrating from SVN to Git.
Please feel free to edit if you feel some information or TODO is missing.
Best regards,
Swapnil M Mane,
ofbiz.apache.org
On Fri, Oct 18, 2019 at 12:13 PM Deepak Dixit <de...@apache.org> wrote:
> +1
> Once we agree to move to git, we can ask infra for further setup.
>
> I think we have our readonly git mirror at gitbox, we need to do following:
>
> - As infra to mark svn ofbiz directory to readonly, make git mirror to
> writable
> - Update buildboat to use git
> - Migrate svn pre/post commit hook
> - Update the ofbiz checkout link on website.
> - Update the RAT tool if needed to use git repo
> -
>
>
> Thanks & Regards
> --
> Deepak Dixit
> ofbiz.apache.org
>
>
> On Fri, Oct 18, 2019 at 11:26 AM Pranay Pandey <
> pranay.pandey@hotwaxsystems.com> wrote:
>
> > +1 Swapnil M.
> >
> > Best regards,
> > Pranay Pandey
> >
> >
> > On Fri, Oct 18, 2019 at 10:37 AM Swapnil M Mane <swapnilmmane@apache.org
> >
> > wrote:
> >
> > > Thank you Mathieu for reviving the topic.
> > >
> > > Dear all,
> > > As discussed previously, all the essential details are incorporated in
> > this
> > > document [1] to help us in migrating from SVN to Git.
> > > Please have a look and let us know your kind feedback/thoughts.
> > > Here are references [2] [3] to our previous discussions for your quick
> > > reference.
> > >
> > > I also feel we should take the next steps in this direction.
> > >
> > > [1] https://cwiki.apache.org/confluence/x/Xg-HBg
> > > [2] https://s.apache.org/lrr3x
> > > [3] https://s.apache.org/qsral
> > >
> > >
> > > Best regards,
> > > Swapnil M Mane,
> > > ofbiz.apache.org
> > >
> > >
> > >
> > > On Thu, Oct 17, 2019 at 7:51 PM Mathieu Lirzin <
> > mathieu.lirzin@nereide.fr>
> > > wrote:
> > >
> > > > Now that the Git synchro is working again, I think it would be great
> if
> > > > we could move forward regarding the SVN to Git migration.
> > > >
> > > > I am not sure what needs be done to achieve such result, is it just a
> > > > matter of opening a INFRA ticket on Jira? What can I do to help?
> > > >
> > > > Thanks.
> > > >
> > > > --
> > > > Mathieu Lirzin
> > > > GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
> > > >
> > >
> >
>
Re: Migrating to Git
Posted by Jacques Le Roux <ja...@les7arts.com>.
The RAT tools is used in Buildbot builds scripts, all builds should be easily modifiable
Jacques
Le 18/10/2019 à 08:43, Deepak Dixit a écrit :
> +1
> Once we agree to move to git, we can ask infra for further setup.
>
> I think we have our readonly git mirror at gitbox, we need to do following:
>
> - As infra to mark svn ofbiz directory to readonly, make git mirror to
> writable
> - Update buildboat to use git
> - Migrate svn pre/post commit hook
> - Update the ofbiz checkout link on website.
> - Update the RAT tool if needed to use git repo
> -
>
>
> Thanks & Regards
> --
> Deepak Dixit
> ofbiz.apache.org
>
>
> On Fri, Oct 18, 2019 at 11:26 AM Pranay Pandey <
> pranay.pandey@hotwaxsystems.com> wrote:
>
>> +1 Swapnil M.
>>
>> Best regards,
>> Pranay Pandey
>>
>>
>> On Fri, Oct 18, 2019 at 10:37 AM Swapnil M Mane <sw...@apache.org>
>> wrote:
>>
>>> Thank you Mathieu for reviving the topic.
>>>
>>> Dear all,
>>> As discussed previously, all the essential details are incorporated in
>> this
>>> document [1] to help us in migrating from SVN to Git.
>>> Please have a look and let us know your kind feedback/thoughts.
>>> Here are references [2] [3] to our previous discussions for your quick
>>> reference.
>>>
>>> I also feel we should take the next steps in this direction.
>>>
>>> [1] https://cwiki.apache.org/confluence/x/Xg-HBg
>>> [2] https://s.apache.org/lrr3x
>>> [3] https://s.apache.org/qsral
>>>
>>>
>>> Best regards,
>>> Swapnil M Mane,
>>> ofbiz.apache.org
>>>
>>>
>>>
>>> On Thu, Oct 17, 2019 at 7:51 PM Mathieu Lirzin <
>> mathieu.lirzin@nereide.fr>
>>> wrote:
>>>
>>>> Now that the Git synchro is working again, I think it would be great if
>>>> we could move forward regarding the SVN to Git migration.
>>>>
>>>> I am not sure what needs be done to achieve such result, is it just a
>>>> matter of opening a INFRA ticket on Jira? What can I do to help?
>>>>
>>>> Thanks.
>>>>
>>>> --
>>>> Mathieu Lirzin
>>>> GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
>>>>
Re: Migrating to Git
Posted by Deepak Dixit <de...@apache.org>.
+1
Once we agree to move to git, we can ask infra for further setup.
I think we have our readonly git mirror at gitbox, we need to do following:
- As infra to mark svn ofbiz directory to readonly, make git mirror to
writable
- Update buildboat to use git
- Migrate svn pre/post commit hook
- Update the ofbiz checkout link on website.
- Update the RAT tool if needed to use git repo
-
Thanks & Regards
--
Deepak Dixit
ofbiz.apache.org
On Fri, Oct 18, 2019 at 11:26 AM Pranay Pandey <
pranay.pandey@hotwaxsystems.com> wrote:
> +1 Swapnil M.
>
> Best regards,
> Pranay Pandey
>
>
> On Fri, Oct 18, 2019 at 10:37 AM Swapnil M Mane <sw...@apache.org>
> wrote:
>
> > Thank you Mathieu for reviving the topic.
> >
> > Dear all,
> > As discussed previously, all the essential details are incorporated in
> this
> > document [1] to help us in migrating from SVN to Git.
> > Please have a look and let us know your kind feedback/thoughts.
> > Here are references [2] [3] to our previous discussions for your quick
> > reference.
> >
> > I also feel we should take the next steps in this direction.
> >
> > [1] https://cwiki.apache.org/confluence/x/Xg-HBg
> > [2] https://s.apache.org/lrr3x
> > [3] https://s.apache.org/qsral
> >
> >
> > Best regards,
> > Swapnil M Mane,
> > ofbiz.apache.org
> >
> >
> >
> > On Thu, Oct 17, 2019 at 7:51 PM Mathieu Lirzin <
> mathieu.lirzin@nereide.fr>
> > wrote:
> >
> > > Now that the Git synchro is working again, I think it would be great if
> > > we could move forward regarding the SVN to Git migration.
> > >
> > > I am not sure what needs be done to achieve such result, is it just a
> > > matter of opening a INFRA ticket on Jira? What can I do to help?
> > >
> > > Thanks.
> > >
> > > --
> > > Mathieu Lirzin
> > > GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
> > >
> >
>
Re: Migrating to Git
Posted by Pranay Pandey <pr...@hotwaxsystems.com>.
+1 Swapnil M.
Best regards,
Pranay Pandey
On Fri, Oct 18, 2019 at 10:37 AM Swapnil M Mane <sw...@apache.org>
wrote:
> Thank you Mathieu for reviving the topic.
>
> Dear all,
> As discussed previously, all the essential details are incorporated in this
> document [1] to help us in migrating from SVN to Git.
> Please have a look and let us know your kind feedback/thoughts.
> Here are references [2] [3] to our previous discussions for your quick
> reference.
>
> I also feel we should take the next steps in this direction.
>
> [1] https://cwiki.apache.org/confluence/x/Xg-HBg
> [2] https://s.apache.org/lrr3x
> [3] https://s.apache.org/qsral
>
>
> Best regards,
> Swapnil M Mane,
> ofbiz.apache.org
>
>
>
> On Thu, Oct 17, 2019 at 7:51 PM Mathieu Lirzin <ma...@nereide.fr>
> wrote:
>
> > Now that the Git synchro is working again, I think it would be great if
> > we could move forward regarding the SVN to Git migration.
> >
> > I am not sure what needs be done to achieve such result, is it just a
> > matter of opening a INFRA ticket on Jira? What can I do to help?
> >
> > Thanks.
> >
> > --
> > Mathieu Lirzin
> > GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
> >
>
Re: Migrating to Git
Posted by Swapnil M Mane <sw...@apache.org>.
Thank you Mathieu for reviving the topic.
Dear all,
As discussed previously, all the essential details are incorporated in this
document [1] to help us in migrating from SVN to Git.
Please have a look and let us know your kind feedback/thoughts.
Here are references [2] [3] to our previous discussions for your quick
reference.
I also feel we should take the next steps in this direction.
[1] https://cwiki.apache.org/confluence/x/Xg-HBg
[2] https://s.apache.org/lrr3x
[3] https://s.apache.org/qsral
Best regards,
Swapnil M Mane,
ofbiz.apache.org
On Thu, Oct 17, 2019 at 7:51 PM Mathieu Lirzin <ma...@nereide.fr>
wrote:
> Now that the Git synchro is working again, I think it would be great if
> we could move forward regarding the SVN to Git migration.
>
> I am not sure what needs be done to achieve such result, is it just a
> matter of opening a INFRA ticket on Jira? What can I do to help?
>
> Thanks.
>
> --
> Mathieu Lirzin
> GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
>