search

the3dfxdude / 7kaa

Seven Kingdoms: Ancient Adversaries - Go to the main source repository at https://sourceforge.net/projects/skfans/ for source code and builds
https://7kfans.com
Other
255 stars 72 forks source link

Pull request to include changes to doc dir #217

Closed tmr83 closed 3 years ago

tmr83 commented 3 years ago

This pull request includes recent code that adds metadata. My intention for it is to aid in documentation and tracking. I want to have the manual version, which is the same as the game version, on the manual somewhere either in the metadata or filename, but I do not want to always bump the version number. Do you know if it is possible to use autoconf or other available solution to set the manual versioning for me?

Side note: if you would like to add a doc variable to configure and have make enter doc to run latexmk, I am okay with it.

tmr83 commented 3 years ago

I also want to point out the changes I made to the text in this pull request to see how controversial it is because I plan on making additional changes under the guise of internationalization.

the3dfxdude commented 3 years ago

So the idea for the changes are ok, but the way you moved the files breaks their link to the past history. Can you do one commit that moves/renames the files instead of creating new files and deleting the old ones in another commit?

tmr83 commented 3 years ago

Closed to rework PR with one commit that moves and not deletes the files/

tmr83 commented 3 years ago

I actually do not know how to move the files without losing the history.

tmr83 commented 3 years ago

Are you able to merge this commit and save your history? https://github.com/W-Damian/7kaa/commit/4b7fba79cc1bc720b24554151e6506df5687178a

the3dfxdude commented 3 years ago

Use git mv

tmr83 commented 3 years ago

Use git mv

I did that the second time, but for some reason Github started tracking changes I did in a deleted branch.

the3dfxdude commented 3 years ago

It might do that. But what's important is to make sure the files have been staged to be renamed before hitting commit.

git mv is the same as a "git add" and "git rm" together in the same commit. I don't know visually how github works, so I hope it's as simple. If anything, do it locally and push the commit to a branch on github. "git gui" is a good way to check if the commit you are getting ready is correct, and you could rename the files first, then click off the added and removed files in "git gui", but "git mv" is probably the cleanest 1 step to get it all done.