[sw360-dev] sw360 - internal repositories (forks) merge concept

[sw360-dev] sw360 - internal repositories (forks) merge concept

From: "Maier, Thomas (CT RDA DS EVO OPS APS DI 1)" <Thomas.Maier@xxxxxxxxxxx>
Date: Fri, 27 Apr 2018 09:00:59 +0000
Accept-language: de-DE, en-US
Delivered-to: sw360-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/sw360-dev>
List-help: <mailto:sw360-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/sw360-dev>, <mailto:sw360-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/sw360-dev>, <mailto:sw360-dev-request@eclipse.org?subject=unsubscribe>
Thread-index: AdPeBZIOPog1PslwSJCu66dwHboSuw==
Thread-topic: sw360 - internal repositories (forks) merge concept

Hi sw360 Team,

currently I am thinking about a good solution for our internal Siemens fork.

Since the repository change we lost our complete commit history for sw360portal.

This occurs some git problems in case of merging branches between github/eclipse and the internal fork.

Changes on the new repository will conflict because there are no ancestors for the files available.

What do you think about these solutions?

1. New Fork (in our internal repository)

2. Git patch file (last sw360/sw360portal -> internal Fork), apply this Patch on eclipse/master and force push to the internal fork

In both cases we will lose the commit history

Do have some other ideas or solutions?

Thanks in advance!

Cheers

Thomas