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.cappell...@gmail.com> wrote:
On Sat, Oct 19, 2019 at 5:31 PM Mathieu Lirzin <mathieu.lir...@nereide.fr>
wrote:
Hello,
Swapnil M Mane <swapnilmm...@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
