Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removal of SVN ID line as it is not needed. #7808

Merged
merged 1 commit into from Nov 10, 2019
Merged

Conversation

@sdcloudt
Copy link
Contributor

sdcloudt commented Oct 28, 2019

SVN is not used anymore. Therefore the /* $Id$ */ lines are not necessary. This PR removes most, if not all, id lines.

I checked the commit, but I would appreciate as checking 1203 files is a job which I nobody wants to do.

I used the following line of bash code to remove all /* $Id$ */ lines:

for file in **/*
do
  sed -Ei '1{N; /^\/\*\s\$Id\$\s\*\/\n$/d}' $file
done
@sdcloudt sdcloudt mentioned this pull request Oct 28, 2019
@glx22
Copy link
Contributor

glx22 commented Oct 28, 2019

*.sq files are generated, you'll need to change

print "/* $I" "d$ */" CR
print "" CR
and
file.WriteLine "/* $I" & "d$ */"
file.WriteLine ""

@LordAro
Copy link
Member

LordAro commented Oct 28, 2019

Also remove that merge commit, not sure how it got past the checker...

@glx22
Copy link
Contributor

glx22 commented Oct 28, 2019

The checker accepts it because we rebase before the check so it just disappear I think

@sdcloudt
Copy link
Contributor Author

sdcloudt commented Oct 29, 2019

I screwed up the git, I am fixing it.

@sdcloudt
Copy link
Contributor Author

sdcloudt commented Oct 29, 2019

I removed some more $Id$ tags, and, removed the generated $Id$ output.

media/extra_grf/shore.nfo Outdated Show resolved Hide resolved
@LordAro
LordAro approved these changes Nov 3, 2019
@LordAro LordAro merged commit 13cc8a0 into OpenTTD:master Nov 10, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20191029.5 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.