Am 18.02.2020 um 11:43 schrieb Jonathan Wakely:
On Tue, 18 Feb 2020 at 06:38, Dennis Luehring wrote:
>
> so the github gcc mirror is already using the new reposurgeon based git
> repo,
>
> that means that all the commit hashes etc. are different if someone
> forked this gcc mirror
>
> so easy pulling from the mirror isn't possible anymore - or am im wrong?
>
>
> is there any description how to "port" over github projects that
> dependens on the old repo?
>
> would a simple rebase work, or cherry picking?
You can use rebasing or cherry-picking, but you need to do so
carefully. If you try to rebase (or cherry-pick) onto the tip of a
branch in the new repo you'll almost certainly get conflicts, because
the new branch in the new repo has moved on since the point where you
last pulled from the old repo.
The best way is to find the commit in the new repo which corresponds
to the last commit you have from the old repo, and rebase onto that.
That way you can graft your local commits onto exactly the same tree
(but with different hashes and different history) which should apply
cleanly.
There's a script to do that at
https://gcc.gnu.org/ml/gcc/2020-01/msg00202.html (and an alternative
in the reply to that email).
To use the script you need to have set up a remote for the old repo
(which you can remove again later if you want):
git remote add gcc-old git://gcc.gnu.org/git/gcc-old.git
git fetch gcc-old
lets see if rebasing or cherry picking is easier, thank you
