DoC has moved from SVN to Git

[Imperator Knoedel]

So I downloaded the whole thingamajig, went into the explorer and wanted to check if it actually worked by opening the XML file for civics and seeing if Central Planning was ruined, and lo, it was not. Starting the game itself confirmed my suspicion that nothing actually had changed compared to 1.12. Upon taking a closer look at the mod folder I noticed a new folder in it, called Dawn-of-Civilization, which apparently does contain what is supposed to be the current Ludwig von Mises approved version, with CivGameCoreDLL and Assets with XML files and such. Either I'm overlooking something obvious or the download messed up and put the files in a new folder rather then overwriting the current ones. Was I supposed to delete the content of my DoC folder before downloading the Git version?

Would it solve the problem if I were to delete everything but the Git folder and then just cut and paste the contents of that folder into the Doc folder itself, or would that mess something up?

I attached screenshots of my DoC folder and the apparent Git folder within for better understanding.

 

[Leoreth]

Gah, that was rhetorical. I didn't really want to know.

As punishment you had to find out anyway!

I suppose it's time I abandoned my whole 'stick furiously to official versions' rule, if only to help the mod develop.

I could say that every Git commit is automatically. That is something I could do using my normative power as the creator of this mod.

But seriously, contribution is very welcome.

So I downloaded the whole thingamajig, went into the explorer and wanted to check if it actually worked by opening the XML file for civics and seeing if Central Planning was ruined, and lo, it was not. Starting the game itself confirmed my suspicion that nothing actually had changed compared to 1.12. Upon taking a closer look at the mod folder I noticed a new folder in it, called Dawn-of-Civilization, which apparently does contain what is supposed to be the current Ludwig von Mises approved version, with CivGameCoreDLL and Assets with XML files and such. Either I'm overlooking something obvious or the download messed up and put the files in a new folder rather then overwriting the current ones. Was I supposed to delete the content of my DoC folder before downloading the Git version?

Would it solve the problem if I were to delete everything but the Git folder and then just cut and paste the contents of that folder into the Doc folder itself, or would that mess something up?

I attached screenshots of my DoC folder and the apparent Git folder within for better understanding.

Nope, everything is fine. Forget about the old DoC you already had: the git clone command provided you with an entirely new one. Think of it as a constantly linked copy of the online version of the repository. By convention, the new folder is named liked the online repository, you simply have to rename it to RFC Dawn of Civilization and you can get going.

May the Hayek be with you.

 

[Imperator Knoedel]

Except everything is not fine, I did cut and paste the interior folder over the original one and now it works.

Also I can't upload anything to this forum because some capitalist virus prevents me from it. I want to see someone put in a gulag for this travesty!

 

[Temujin8k]

Do I have to specify which branch to clone? If I don't, will I get both branches? Or one of them will get cloned by default?

 

[Leoreth]

The default branch is develop, if you don't specify anything that should be the branch you are on after clone. But afaik clone will always check out all branches.

 

[Leoreth]

I have updated the Welcome thread with some up to date info on Git, especially on using for contributing. It should be more digestible than what I have written here.

 

[Tigranes]

I find Git's long alphanumeric code generated for every given commit as very user unfriendly. If five months from now I would like to go back to, say, the 2nd commit after v.1.13 release -- I am not sure how one would go about locating it. Consecutive numbering in SVN was a simple and obvious idea.

 

[Leoreth]

It is more user-friendly, but wouldn't be practical for how Git operates. Since commits are designed to be created in several disjoint branches that can merge later, there is no such thing as a sequential order of commit. Or alternately, establishing one would prevent commit ids from being unique identifiers.

But you still have the commit log for your branch, which you can rather easily access. And that's the better way to do it regardless of how commits are numbered.

 

[cudfather]

It wouldn't really, just have 960, 961, 961a, 961b. Versions a and b are branches that started at 961. They would continue as 962a, 963a etc. Over 27 branches? 961aa. But what can you do.

 

[Leoreth]

Doesn't work. Depending on how branches are merged, commits created earlier chronologically may appear later in the commit history. They really thought this through better than you and I

 

[Vectors]

I find Git's long alphanumeric code generated for every given commit as very user unfriendly. If five months from now I would like to go back to, say, the 2nd commit after v.1.13 release -- I am not sure how one would go about locating it. Consecutive numbering in SVN was a simple and obvious idea.

pfft, linear time is a Whiggish social construct.

 

[cudfather]

I'm having a really bad time with Git. Please tell me how to revert to base 1.13 or any commit really, since all I ever do is apparently updating specific files or folders to different commits, which results in a crashfest. Newbie guide to global pulling please.

 

[Leoreth]

What exactly is your problem? Have you accidentally created commits? That could cause merge conflicts if you pull afterwards.

I never undid commits with TortoiseGit, but it should be possible to open the commit log and then select the last commit made by me and revert to it. Afterwards, do a pull.

Not sure what you mean by global pull though.

(In general, you should not modify the Git repo cloned from my main repo, if you want to make changes fork the repo first.)

And never forget:

Spoiler :

This happens to everyone at first.

 

[cudfather]

I guess I'll redownload then.

 

[Leoreth]

Haha. Yeah, that should work as well.

 

[cudfather]

I tried to play a game before giving up, half the civs didn't spawn. I played 600AD as England and HRE, Mongols, Seljuks, Aztecs and Inca were missing.

 

[freethink]

So, I am new to this Git Hub, I have never tried to use it before

I cannot successfully create a GIT clone, I always get the following text,

git.exe clone --progress -v "https://github.com/dguenms/Dawn-of-Civilization.git" "C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization"

fatal: could not create work tree dir 'C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization': Permission denied

What am I doing wrong? I was following the instructions of the post.
Thanks in advance,

 

[freethink]

I also tried downloading DOC directly from GIT hub, and I moved my original Dawn of Civ folder to my desktop as a backup, however when I attempted to play the game I got a message telling me the World Builder could not be read.

I should have a better understanding of this, but I am at a loss.

 

[TJDowling]

So, I am new to this Git Hub, I have never tried to use it before

I cannot successfully create a GIT clone, I always get the following text,

git.exe clone --progress -v "https://github.com/dguenms/Dawn-of-Civilization.git" "C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization"

fatal: could not create work tree dir 'C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization': Permission denied

What am I doing wrong? I was following the instructions of the post.
Thanks in advance,

I think this is the same problem I had when I first used git. Clone the mod to a directory on your desktop and then move the whole folder back into your mods folder. I think it's a problem where git doesn't have permission to create a directory in your program files. Worked for me anyway. Good luck!

 

[KeeperOT7Keys]

So, I am new to this Git Hub, I have never tried to use it before

I cannot successfully create a GIT clone, I always get the following text,

git.exe clone --progress -v "https://github.com/dguenms/Dawn-of-Civilization.git" "C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization"

fatal: could not create work tree dir 'C:\Program Files (x86)\2K Games\Civilization IV Complete\Sid Meier's Civilization 4 Complete\Beyond the Sword\Mods\Dawn-of-Civilization': Permission denied

What am I doing wrong? I was following the instructions of the post.
Thanks in advance,

you need to open whatever the program using as (git bash, cmd etc.) "administrator"