after a long while of not maintaining it I am currently merging my patch into the current master sources from github.
I used to use the old repository url: http://git.openttd.org/openttd/trunk.git
But I realized that I get a redirect to the new repo:
$ git remote show openttd
fatal: unable to update url base from redirection:
asked for: http://git.openttd.org/openttd/trunk.git/info/refs?service=git-upload-pack
I updated the remote and fetched the branch again, but during the merge I realized that I don't have a common merge-base anymore and this creates a million conflicts during the merge. The last merge against the old github url was done against this commit:
d6df92b6d (openttd/master, openttd) (svn r27969) -Update from Eints: danish: 22 changes by Knogle
The last common commit is:
$ git merge-base openttd nr/master
$ git --no-pager log -1 a580b4c21ee20179fa50bdab04aaeb586185fe8e
Author: bjarni <firstname.lastname@example.org>
Date: Mon Nov 29 20:03:04 2004 +0000
(svn r855) BeOS: moved bemidi to os/beos/ (w-ber)
Then they diverge starting at the next commit:
$ git --no-pager log --oneline openttd | grep 'svn r856)'
4950c36769 (svn r856) Makefile: added the flags CYGWIN and MINGW to libdetection. They were missing in the autodetected makefile.config
$ git --no-pager log --oneline nr/master | grep 'svn r856)'
00d6b3609f (svn r856) Makefile: added the flags CYGWIN and MINGW to libdetection. They were missing in the autodetected makefile.config
Does anybody know what is the reason for this?
I think for my merge I will just cherry-pick all commits for my own patch onto a new branch or something.