FUDforum
Fast Uncompromising Discussions. FUDforum will get your users talking.
Home » FUDforum » How To » Putting everything under version control
Show: Today's Messages :: Polls :: Message Navigator
Switch to threaded view of this topic Create a new topic Submit Reply
Putting everything under version control [message #167654] Thu, 23 August 2012 08:06 Go to next message
StephenKing is currently offline  StephenKing   Germany
Messages: 10
Registered: August 2012
Karma: 0
Junior Member
Hi guys,

I'd like to put the complete FUDforum code under version control, as we need 2 patches. Therefore I've imported your SVN into a Git repository, because there it's easier to track own changes.

It works pretty fine, I'm just wondering where the files www_root/{index,feed,rdf}.php come from / how they are generated during installation. They exist, as I copied our installation over the imported repository, but they don't exist in the repository itself.

Was this question (and my intention) comprehensible?

Thanks!
Steffen

Report message to a moderator

Re: Putting everything under version control [message #167655 is a reply to message #167654] Thu, 23 August 2012 10:05 Go to previous messageGo to next message
naudefj is currently offline  naudefj   South Africa
Messages: 3771
Registered: December 2004
Karma: 28
Senior Member
Administrator
Core Developer
They are generated when a theme is compiled. See Theme Manager.

For example:
src/root_index.php.t + thm/default/tmpl/root_index.tmpl + [selected language] --> index.php

Report message to a moderator

Aw: Re: Putting everything under version control [message #167656 is a reply to message #167655] Thu, 23 August 2012 10:07 Go to previous messageGo to next message
StephenKing is currently offline  StephenKing   Germany
Messages: 10
Registered: August 2012
Karma: 0
Junior Member
Thanks for your quick response! So I can exclude them from version control, I guess?!

Report message to a moderator

Re: Aw: Re: Putting everything under version control [message #167657 is a reply to message #167656] Thu, 23 August 2012 10:13 Go to previous messageGo to next message
naudefj is currently offline  naudefj   South Africa
Messages: 3771
Registered: December 2004
Karma: 28
Senior Member
Administrator
Core Developer
Yes, all generated, temp and cahce files should be excluded from version control.

Report message to a moderator

Re: Putting everything under version control [message #167658 is a reply to message #167654] Thu, 23 August 2012 13:32 Go to previous messageGo to next message
StephenKing is currently offline  StephenKing   Germany
Messages: 10
Registered: August 2012
Karma: 0
Junior Member
Great!

What about install/www_root/(adm/)GLOBALS.php?

They just include the GLOBALS.php from the data/include/ folder and seem to be required.

Steffen

Report message to a moderator

Re: Putting everything under version control [message #167659 is a reply to message #167658] Thu, 23 August 2012 14:04 Go to previous messageGo to next message
naudefj is currently offline  naudefj   South Africa
Messages: 3771
Registered: December 2004
Karma: 28
Senior Member
Administrator
Core Developer
It is either a synlink or a stub to data/include/GLOBALS.php. Should be excluded as well.

Report message to a moderator

Re: Putting everything under version control [message #167680 is a reply to message #167654] Thu, 30 August 2012 02:12 Go to previous messageGo to next message
NeXuS is currently offline  NeXuS   Korea, Republic of
Messages: 121
Registered: July 2010
Location: South Korea
Karma: 5
Senior Member
Contributing Core Developer
If you think your patches would benefit the whole community feel free to post them! Smile

Report message to a moderator

Re: Putting everything under version control [message #167687 is a reply to message #167680] Thu, 30 August 2012 06:05 Go to previous messageGo to next message
naudefj is currently offline  naudefj   South Africa
Messages: 3771
Registered: December 2004
Karma: 28
Senior Member
Administrator
Core Developer
We should maybe convert FUDforum's repository to GIT at some stage. Sourceforge supports both.

Report message to a moderator

Re: Putting everything under version control [message #167688 is a reply to message #167687] Thu, 30 August 2012 06:07 Go to previous messageGo to next message
NeXuS is currently offline  NeXuS
Messages: 121
Registered: July 2010
Location: South Korea
Karma: 5
Senior Member
Contributing Core Developer
Might be an idea, although it really depends on which development model one wants to support. GIT is definitely more powerful than SVN, but it is also much more complicated.

Report message to a moderator

Re: Putting everything under version control [message #167689 is a reply to message #167688] Thu, 30 August 2012 06:18 Go to previous messageGo to next message
naudefj is currently offline  naudefj   South Africa
Messages: 3771
Registered: December 2004
Karma: 28
Senior Member
Administrator
Core Developer
Yea, it look pretty complicated! I don't have a personal preference, but it looks like more and more users actually prefer GIT to SVN. As far as I understand you can still use the SVN commands against GIT? If true, it will help to ease the migration process. Are there any other cons that we need to look out for?

Report message to a moderator

Re: Putting everything under version control [message #167690 is a reply to message #167689] Thu, 30 August 2012 06:24 Go to previous messageGo to next message
NeXuS is currently offline  NeXuS   Korea, Republic of
Messages: 121
Registered: July 2010
Location: South Korea
Karma: 5
Senior Member
Contributing Core Developer
No, Frank, the commands are different. There is a guide called "Git - SVN Crash Course" that shows you the main differences, yet GIT does much more.

For example, Git allows for true branching and merging (carrying all the tags and metadata around, not just copying like SVN does). This also means that identifiers for versions are ugly-as-hell 160 character long SHA1 hashes.

Also, some commands are quite confusing for SVN users (see GIT checkout).

EDIT - Oh, and the whole idea of distributed repositories may be daunting if one is used to SVN (which uses a centralized repo), although it allows for funny things like "pulling" (checkout and merge) code from different remote repos into a local one.

[Updated on: Thu, 30 August 2012 06:28]

Report message to a moderator

Re: Putting everything under version control [message #167693 is a reply to message #167654] Thu, 30 August 2012 07:26 Go to previous message
StephenKing is currently offline  StephenKing   Germany
Messages: 10
Registered: August 2012
Karma: 0
Junior Member
Thanks for the nice discussion.

Git is definitely more powerful and thus more complicated.

We (the TYPO3 CMS project) switched development from SVN to Git a year and a half ago. We're using Gerrit as a review system (http://review.typo3.org), which enforces peer-reviewed commits (we had email reviews with patch files attached before).

A hand full of people were overwhelmed by the complexity, but in total it was a huge success. We often get new contributors pushing their first change set into the review workflow.

P.S: Svn commands can't be used with git, bit the other way around: git-svn enables you to use a git repo but work with a svn server.

P.P.S: I didn't make the changes, we will evaluate them and, of course, publish them, if they make sense. I know that one is for changing the colours of cites (in imported NNTP messages - is there a way to override the hardcoded colours?) and the other one is IIRC for debugging the NNTP imports

Report message to a moderator

  Switch to threaded view of this topic Create a new topic Submit Reply
Previous Topic: Mailing List Integration and Replies
Next Topic: Facebook integration
Goto Forum:
  

-=] Back to Top [=-
[ Syndicate this forum (XML) ] [ RSS ]

Current Time: Fri Nov 01 16:24:53 GMT 2024

Total time taken to generate the page: 0.02605 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.1.3.
Copyright ©2001-2023 FUDforum Bulletin Board Software