Next step to migrate OFBiz from Subversion (SVN) to Git

[Swapnil M Mane]

Hi team,

Thanks so much everyone for participating in the discussion [1] to migrate
OFBiz from Subversion (SVN) to Git version control system.

As we have concluded to move our source repository from SVN to Git.
Based on our previous discussions [1], here is the document [2] which can
help us to strategies our migration.

This document contain all the relevant topics which need to consider
before, during and after migration to Git.

   1. Code Repository
   2. Workflow
      1. Small Features / Bug Fixes
      2. Large Features
   3. Buildbot configuration with Git (Build Scripts)
   4. Revert workflow
      1. Revert Pull Request
      2. Revert a commit
   5. Backport the fixes
   6. Release management
   7. Equivalent of svn:auto-props properties
   8. Update the website, wiki documents and references

The workflow in document is suggested by Taher in thread [1], and based on
my experience with Git, I have added respective the points in the above
sections.

I have added some task in document which needs to done, confluence provide
use feature to assign the task in the document itself.
Example, I have assigned two tasks to me under "Update the website, wiki
documents and references" section. We can use this feature distribute our
tasks.

I request everyone to please have a look into this document and kindly
share your thoughts.
Also, feel free to update the document.


[1]
https://lists.apache.org/thread.html/9f89b2a24ff427dffaf71294fc20306994fd1c19a6b24e64c4b06d71@1431423796@%3Cdev.ofbiz.apache.org%3E
[2] https://cwiki.apache.org/confluence/x/Xg-HBg


- Best Regards,
Swapnil M Mane,
ofbiz.apache.org

[Mathieu Lirzin]

Hello Swapnil,

Swapnil M Mane <[hidden email]> writes:

> As we have concluded to move our source repository from SVN to Git.
> Based on our previous discussions [1], here is the document [2] which can
> help us to strategies our migration.
>
> This document contain all the relevant topics which need to consider
> before, during and after migration to Git.

> I request everyone to please have a look into this document and kindly
> share your thoughts.
> Also, feel free to update the document.

I appreciate your writing effort, however I think your writing tends to
mix Git and Github workflows which are two separate things.

As far as I understand it, we agreed to change our version control
system to use Git not to change our contribution workflow to use Github.
Contributions will continue to be done via JIRA, patches and the ML, as
long as we don't discuss and vote for that.

Personnally I will be against using Github social features (issues,
pull-request, wiki, ...) in our contribution process.

Thanks.

--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37

[Swapnil M Mane]

Dear Mathieu,

You are 200% correct, please accept my kind apologies for this.
I have update the document [1] with appropriate information.

Thanks so much for correcting me.


[1] https://cwiki.apache.org/confluence/x/Xg-HBg


- Best Regards,
Swapnil M Mane,
ofbiz.apache.org



On Wed, May 1, 2019 at 8:54 PM Mathieu Lirzin <[hidden email]>
wrote:

> Hello Swapnil,
>
> Swapnil M Mane <[hidden email]> writes:
>
> > As we have concluded to move our source repository from SVN to Git.
> > Based on our previous discussions [1], here is the document [2] which can
> > help us to strategies our migration.
> >
> > This document contain all the relevant topics which need to consider
> > before, during and after migration to Git.
>
> > I request everyone to please have a look into this document and kindly
> > share your thoughts.
> > Also, feel free to update the document.
>
> I appreciate your writing effort, however I think your writing tends to
> mix Git and Github workflows which are two separate things.
>
> As far as I understand it, we agreed to change our version control
> system to use Git not to change our contribution workflow to use Github.
> Contributions will continue to be done via JIRA, patches and the ML, as
> long as we don't discuss and vote for that.
>
> Personnally I will be against using Github social features (issues,
> pull-request, wiki, ...) in our contribution process.
>
> Thanks.
>
> --
> Mathieu Lirzin
> GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37
>

[Deepak Dixit-4]

Thanks you Swapnil for your effort,

I agree with Mathieu, as a first step we have to focus on switching version
control from svn to git (with existing contribution flow),
 once it has done we can discuss the contribution flow using GitHub
feature.

Kind Regards,
Deepak Dixit
DIRECTOR OF PRODUCT ENGINEERING
mobile: [phone]
email: [hidden email]
*www.hotwax.co <http://www.hotwax.co/>*


On Wed, May 1, 2019 at 7:14 PM Swapnil M Mane <[hidden email]>
wrote:

> Hi team,
>
> Thanks so much everyone for participating in the discussion [1] to migrate
> OFBiz from Subversion (SVN) to Git version control system.
>
> As we have concluded to move our source repository from SVN to Git.
> Based on our previous discussions [1], here is the document [2] which can
> help us to strategies our migration.
>
> This document contain all the relevant topics which need to consider
> before, during and after migration to Git.
>
>    1. Code Repository
>    2. Workflow
>       1. Small Features / Bug Fixes
>       2. Large Features
>    3. Buildbot configuration with Git (Build Scripts)
>    4. Revert workflow
>       1. Revert Pull Request
>       2. Revert a commit
>    5. Backport the fixes
>    6. Release management
>    7. Equivalent of svn:auto-props properties
>    8. Update the website, wiki documents and references
>
> The workflow in document is suggested by Taher in thread [1], and based on
> my experience with Git, I have added respective the points in the above
> sections.
>
> I have added some task in document which needs to done, confluence provide
> use feature to assign the task in the document itself.
> Example, I have assigned two tasks to me under "Update the website, wiki
> documents and references" section. We can use this feature distribute our
> tasks.
>
> I request everyone to please have a look into this document and kindly
> share your thoughts.
> Also, feel free to update the document.
>
>
> [1]
>
> https://lists.apache.org/thread.html/9f89b2a24ff427dffaf71294fc20306994fd1c19a6b24e64c4b06d71@1431423796@%3Cdev.ofbiz.apache.org%3E
> [2] https://cwiki.apache.org/confluence/x/Xg-HBg
>
>
> - Best Regards,
> Swapnil M Mane,
> ofbiz.apache.org
>

[Swapnil M Mane]

Thank you Deepak for your comments, I am also inline with this.
The document [1] contains the information of switching version control from
SVN to Git (with existing contribution flow).


[1] https://cwiki.apache.org/confluence/x/Xg-HBg


- Best Regards,
Swapnil M Mane,
ofbiz.apache.org



On Wed, May 8, 2019 at 12:22 PM Deepak Dixit <[hidden email]> wrote:

> Thanks you Swapnil for your effort,
>
> I agree with Mathieu, as a first step we have to focus on switching
> version control from svn to git (with existing contribution flow),
>  once it has done we can discuss the contribution flow using GitHub
> feature.
>
> Kind Regards,
> Deepak Dixit
> DIRECTOR OF PRODUCT ENGINEERING
> mobile: [phone]
> email: [hidden email]
> *www.hotwax.co <http://www.hotwax.co/>*
>
>
> On Wed, May 1, 2019 at 7:14 PM Swapnil M Mane <[hidden email]>
> wrote:
>
>> Hi team,
>>
>> Thanks so much everyone for participating in the discussion [1] to migrate
>> OFBiz from Subversion (SVN) to Git version control system.
>>
>> As we have concluded to move our source repository from SVN to Git.
>> Based on our previous discussions [1], here is the document [2] which can
>> help us to strategies our migration.
>>
>> This document contain all the relevant topics which need to consider
>> before, during and after migration to Git.
>>
>>    1. Code Repository
>>    2. Workflow
>>       1. Small Features / Bug Fixes
>>       2. Large Features
>>    3. Buildbot configuration with Git (Build Scripts)
>>    4. Revert workflow
>>       1. Revert Pull Request
>>       2. Revert a commit
>>    5. Backport the fixes
>>    6. Release management
>>    7. Equivalent of svn:auto-props properties
>>    8. Update the website, wiki documents and references
>>
>> The workflow in document is suggested by Taher in thread [1], and based on
>> my experience with Git, I have added respective the points in the above
>> sections.
>>
>> I have added some task in document which needs to done, confluence provide
>> use feature to assign the task in the document itself.
>> Example, I have assigned two tasks to me under "Update the website, wiki
>> documents and references" section. We can use this feature distribute our
>> tasks.
>>
>> I request everyone to please have a look into this document and kindly
>> share your thoughts.
>> Also, feel free to update the document.
>>
>>
>> [1]
>>
>> https://lists.apache.org/thread.html/9f89b2a24ff427dffaf71294fc20306994fd1c19a6b24e64c4b06d71@1431423796@%3Cdev.ofbiz.apache.org%3E
>> [2] https://cwiki.apache.org/confluence/x/Xg-HBg
>>
>>
>> - Best Regards,
>> Swapnil M Mane,
>> ofbiz.apache.org
>>
>

[Swapnil M Mane]

Hello team,

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 thoughts.

[1] https://cwiki.apache.org/confluence/x/Xg-HBg

Best Regards,
Swapnil M Mane,
ofbiz.apache.org



On Thu, May 9, 2019 at 9:26 AM Swapnil M Mane <[hidden email]>
wrote:

> Thank you Deepak for your comments, I am also inline with this.
> The document [1] contains the information of switching version control
> from SVN to Git (with existing contribution flow).
>
>
> [1] https://cwiki.apache.org/confluence/x/Xg-HBg
>
>
> - Best Regards,
> Swapnil M Mane,
> ofbiz.apache.org
>
>
>
> On Wed, May 8, 2019 at 12:22 PM Deepak Dixit <[hidden email]>
> wrote:
>
>> Thanks you Swapnil for your effort,
>>
>> I agree with Mathieu, as a first step we have to focus on switching
>> version control from svn to git (with existing contribution flow),
>>  once it has done we can discuss the contribution flow using GitHub
>> feature.
>>
>> Kind Regards,
>> Deepak Dixit
>> DIRECTOR OF PRODUCT ENGINEERING
>> mobile: [phone]
>> email: [hidden email]
>> *www.hotwax.co <http://www.hotwax.co/>*
>>
>>
>> On Wed, May 1, 2019 at 7:14 PM Swapnil M Mane <[hidden email]>
>> wrote:
>>
>>> Hi team,
>>>
>>> Thanks so much everyone for participating in the discussion [1] to
>>> migrate
>>> OFBiz from Subversion (SVN) to Git version control system.
>>>
>>> As we have concluded to move our source repository from SVN to Git.
>>> Based on our previous discussions [1], here is the document [2] which can
>>> help us to strategies our migration.
>>>
>>> This document contain all the relevant topics which need to consider
>>> before, during and after migration to Git.
>>>
>>>    1. Code Repository
>>>    2. Workflow
>>>       1. Small Features / Bug Fixes
>>>       2. Large Features
>>>    3. Buildbot configuration with Git (Build Scripts)
>>>    4. Revert workflow
>>>       1. Revert Pull Request
>>>       2. Revert a commit
>>>    5. Backport the fixes
>>>    6. Release management
>>>    7. Equivalent of svn:auto-props properties
>>>    8. Update the website, wiki documents and references
>>>
>>> The workflow in document is suggested by Taher in thread [1], and based
>>> on
>>> my experience with Git, I have added respective the points in the above
>>> sections.
>>>
>>> I have added some task in document which needs to done, confluence
>>> provide
>>> use feature to assign the task in the document itself.
>>> Example, I have assigned two tasks to me under "Update the website, wiki
>>> documents and references" section. We can use this feature distribute our
>>> tasks.
>>>
>>> I request everyone to please have a look into this document and kindly
>>> share your thoughts.
>>> Also, feel free to update the document.
>>>
>>>
>>> [1]
>>>
>>> https://lists.apache.org/thread.html/9f89b2a24ff427dffaf71294fc20306994fd1c19a6b24e64c4b06d71@1431423796@%3Cdev.ofbiz.apache.org%3E
>>> [2] https://cwiki.apache.org/confluence/x/Xg-HBg
>>>
>>>
>>> - Best Regards,
>>> Swapnil M Mane,
>>> ofbiz.apache.org
>>>
>>

[mthl]

Hello Swapnil and others,

Swapnil M Mane <[hidden email]> writes:

> 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 thoughts.
>
> [1] https://cwiki.apache.org/confluence/x/Xg-HBg

Regarding the Git migration I would like to know people's opinion
regarding a possible history clean-up which would allow contributors to
have a smaller repository size on their development machine and quicker
initial setup which is nice for newcomers.

To be more precise the framework repository is currently 806 MiB before
compilation which takes around 15 min to download from the Github mirror
on my machine from DSL connection at a 780 KiB/s rate.

My guess is that the repository heavy weight is mainly due to dependency
JARs that were previously committed in the Version Control System (VCS)
before the Gradle migration.  This guess is based on the known fact that
Git doesn't play well with non-text based files and that JARs are binary
Zip files.

As a consequence I would suggest that while actually migrating to Git as
our main VCS we cut the history after the Gradle migration [1] for the
new reference repository and keep previous history in an archive
repository (for historians).

I currently don't know the technical details on how we should precisely
do such thing and what would be the repository size after clean up, but
I am sure the process is well documented somewhere.  Additionally a
similar cleanup could be done for the plugin repository.

What do people think?

[1] https://svn.apache.org/repos/asf/ofbiz/trunk@1752033

--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37

[Jacques Le Roux]

Le 04/08/2019 à 01:11, Mathieu Lirzin a écrit :

> Hello Swapnil and others,
>
> Swapnil M Mane <[hidden email]> writes:
>
>> 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 thoughts.
>>
>> [1] https://cwiki.apache.org/confluence/x/Xg-HBg
> Regarding the Git migration I would like to know people's opinion
> regarding a possible history clean-up which would allow contributors to
> have a smaller repository size on their development machine and quicker
> initial setup which is nice for newcomers.
>
> To be more precise the framework repository is currently 806 MiB before
> compilation which takes around 15 min to download from the Github mirror
> on my machine from DSL connection at a 780 KiB/s rate.
>
> My guess is that the repository heavy weight is mainly due to dependency
> JARs that were previously committed in the Version Control System (VCS)
> before the Gradle migration.  This guess is based on the known fact that
> Git doesn't play well with non-text based files and that JARs are binary
> Zip files.
>
> As a consequence I would suggest that while actually migrating to Git as
> our main VCS we cut the history after the Gradle migration [1] for the
> new reference repository and keep previous history in an archive
> repository (for historians).
>
> I currently don't know the technical details on how we should precisely
> do such thing and what would be the repository size after clean up, but
> I am sure the process is well documented somewhere.  Additionally a
> similar cleanup could be done for the plugin repository.
>
> What do people think?
>
> [1] https://svn.apache.org/repos/asf/ofbiz/trunk@1752033

Hi Mathieu,

I see no reason to not keep this information in the svn repo while using Git as the repo. So in case, all would be there, the svn repo would be the
archive. I'm sure there would be nothing safer...

Jacques