[
https://issues.apache.org/jira/browse/OFBIZ-11297?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17023760#comment-17023760 ]
Jacques Le Roux commented on OFBIZ-11297:
-----------------------------------------
To be sure I did not miss anything, I send this message to GitHub's contact:
{panel:title=Message to GitHub's contact}
Hi,
I'm an ASF (Apache Software Fundation) member; and a PMC member of the Apache OFBiz project, but here is a question of my own.
The ASF infra team provides us (OFBiz project) with dual hosting[0] Gitbox at the ASF[1] and GitHub repos[2][3]
Before we were using Svn and created backporting mergefrom*.* scripts to backport trunk commits in branches by merging them[4]. We were running these scripts from the directories branches to baskport to. I think it's impossible to somehow reuse them by merging commits like we did before (I tried) , eg for framework (I also attached the mergefromtrunk.bat modified file as a text file)
----------------------------------------------------------------------------------------
-svn log
https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
+svn log
https://github.com/apache/ofbiz-framework.git/trunk -r %version% > log.tmp
-svn merge -r %prevRev%:%version%
https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk+svn merge -r %prevRev%:%version%
https://github.com/apache/ofbiz-framework.git/trunk----------------------------------------------------------------------------------------
But be sure I did not miss anything, I'd please like a confirmation.
Thanks in advance!
Jacques
[0]
https://blogs.apache.org/infra/?date=201904&cat=General[1]
https://gitbox.apache.org/repos/asf#ofbiz[2]
https://github.com/apache/ofbiz-framework[3]
https://github.com/apache/ofbiz-plugins[4]
https://github.com/apache/ofbiz-tools/{panel}
> Tools to backport
> -----------------
>
> Key: OFBIZ-11297
> URL:
https://issues.apache.org/jira/browse/OFBIZ-11297> Project: OFBiz
> Issue Type: Sub-task
> Reporter: Jacques Le Roux
> Priority: Major
>
> Currently backport in Git (to R18 and R17) is mostly done by cherry picking. This is hand work. I think we should concentrate on tools necessary to backport with Git. Like the convenient scripts we had previously with Svn.
> And if we want to continuously/seriously backport to R16 we need a such tool too, from Git to Svn, using patches maybe. An alternative is to stop supporting R16 and release R17. Sincerely, I'm actually more inclined to this alternative...
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
Locked
