[release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen
Robert Varga <nite@...>
On 27/06/17 12:13, Tomáš Slušný wrote:
Hello, rather than copying the code, can you please have LF import the repository? That way we do not lose history -- which is very important. Regards, Robert |
Tomáš Slušný <tomas.slusny@...>
Hello Robert,
I can import OpenFlowJava using `git subtree` to not lose history (and I actually have it already prepared in my local repository, because that was first thing I tried), but then it would create Gerrit patch for each OpenFlowJava commit if I am not wrong. Or is there another method of doing this merge?
Regards, Tomas Slusny Od: Robert Varga <nite@...>
Odoslané: utorok, 27. júna 2017 12:23 Komu: Tomáš Slušný; release@... Kópia: openflowjava-dev@...; Michal Rehák; openflowplugin-dev; Abhijit Kumbhare; tsc@... Predmet: Re: [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen On 27/06/17 12:13, Tomáš Slušný wrote:
> > https://wiki.opendaylight.org/view/Weather#OpenFlowJava_being_merged_into_OpenFlowPlugin_in_Nitrogen > > > OpenFlowJava being merged into OpenFlowPlugin in Nitrogen[edit > <https://wiki.opendaylight.org/index.php?title=Weather&action=edit§ion=9>] > > * *Description:* > > Merge OpenFlowJava into OpenFlowPlugin repository to decrease the > logistics related to the OpenFlow southbound development. > > * *Reported By:* Tomas Slusny, Email: tomas.slusny@..., IRC: > tomasslusny > * *Reported On:* 06/27/2017 > * *Links to opened bugs:* > o https://bugs.opendaylight.org/show_bug.cgi?id=8747 > * *Links to patches:* > o https://git.opendaylight.org/gerrit/#/c/59528/ > o https://git.opendaylight.org/gerrit/#/c/59529/ > o https://git.opendaylight.org/gerrit/#/c/59550/ Hello, rather than copying the code, can you please have LF import the repository? That way we do not lose history -- which is very important. Regards, Robert Tomáš Slušný
Software Developer
PANTHEON
technologies s.r.o.
Janka Kráľa 9, 974 01 Banská Bystrica
Slovakia
Tel / +421 220 665 111
MAIL
/
tomas.slusny@...
WEB
/
https://pantheon.tech
|
Jozef Bacigál <jozef.bacigal@...>
HI all,
just thoughts
we can still keep the history in frozen project, with the description on the first commit that the projects were merged together. And with the information where the old history can be found. If I am not wrong merging two repositories with git subtree creates a huge amount of merging commits ?
Jozef Od: Tomáš Slušný <tomas.slusny@...>
Odoslané: utorok, 27. júna 2017 12:52:45 Komu: Robert Varga; release@... Kópia: openflowjava-dev@...; tsc@...; Michal Rehák; openflowplugin-dev Predmet: Re: [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen Hello Robert,
I can import OpenFlowJava using `git subtree` to not lose history (and I actually have it already prepared in my local repository, because that was first thing I tried), but then it would create Gerrit patch for each OpenFlowJava commit if I am not wrong. Or is there another method of doing this merge?
Regards, Tomas Slusny Od: Robert Varga <nite@...>
Odoslané: utorok, 27. júna 2017 12:23 Komu: Tomáš Slušný; release@... Kópia: openflowjava-dev@...; Michal Rehák; openflowplugin-dev; Abhijit Kumbhare; tsc@... Predmet: Re: [release] WEATHER - OpenFlowJava being merged into OpenFlowPlugin in Nitrogen On 27/06/17 12:13, Tomáš Slušný wrote:
> > https://wiki.opendaylight.org/view/Weather#OpenFlowJava_being_merged_into_OpenFlowPlugin_in_Nitrogen > > > OpenFlowJava being merged into OpenFlowPlugin in Nitrogen[edit > <https://wiki.opendaylight.org/index.php?title=Weather&action=edit§ion=9>] > > * *Description:* > > Merge OpenFlowJava into OpenFlowPlugin repository to decrease the > logistics related to the OpenFlow southbound development. > > * *Reported By:* Tomas Slusny, Email: tomas.slusny@..., IRC: > tomasslusny > * *Reported On:* 06/27/2017 > * *Links to opened bugs:* > o https://bugs.opendaylight.org/show_bug.cgi?id=8747 > * *Links to patches:* > o https://git.opendaylight.org/gerrit/#/c/59528/ > o https://git.opendaylight.org/gerrit/#/c/59529/ > o https://git.opendaylight.org/gerrit/#/c/59550/ Hello, rather than copying the code, can you please have LF import the repository? That way we do not lose history -- which is very important. Regards, Robert Tomáš Slušný
Software Developer
PANTHEON
technologies s.r.o.
Janka Kráľa 9, 974 01 Banská Bystrica
Slovakia
Tel / +421 220 665 111
MAIL
/
tomas.slusny@...
WEB
/
https://pantheon.tech
Jozef Bacigál
Senior Software Engineer
PANTHEON
technologies s.r.o.
Janka Kráľa 9, 974 01 Banská Bystrica
Slovakia
Tel / +421 220 665 111
MAIL
/
jozef.bacigal@...
WEB
/
https://pantheon.tech
|
Robert Varga <nite@...>
On 27/06/17 12:52, Tomáš Slušný wrote:
Hello Robert,What we have done in the past was to ask Linux Foundation admins to populate the repository, side-stepping gerrit. We have done this for mdsal and netconf at least. I am not sure if the same effect is doable with gerrit. Regards, Robert |