[TYPO3-dev] GIT for "normal" (TortoiseGIT-) users

[Steffen Gebert]

Hi Stefan,

we provide some links to Git Introductions:
http://wiki.typo3.org/Git_Introduction

> seems, that this GIT-Stuff is more complicated for me
> than I thought it would be ... so I would be happy to
> get some help for my first steps:
I think that's the same for us. A new challenge, but opportunity for 
everyone. Once you're used to it, you will probably love it :)

> Question 1:
> If I simply want to follow the changes of 4.5.x-dev
> I only have to "Git Sync" ? Or is it "Git pull" ?
I think "Sync" is an invention of TortoiseGit. I assume it pulls and 
pushes. Pull is the step to retrieve changes.

> Question 2:
> When I modify the 4.5 sources locally:
> What do I have to do ? I think "Git Commit" - right ?
> Something else ? At least: I do not have to
> do a "Git push" - right ?
> (If I understand right, then I would have to push
> to Gerrit and create a RFC, if I think my changes are
> worth to make it to the core...)
Exactly.

> Question 3:
> Until now, I used SVN. My local copy is still at
> Rev. 10669, the latest version of
> https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-5
> But I have applied there many patches and changes.
> How do I get my local (svn-) changes to the git clone ?
> I already created a patch of all changes via TortoiseSVN,
> but I can't find a way to apply this patch to the
> Git clone ...
Git apply is pretty careful. I suggest using the patch command in the 
Git Bash (sorry for nudging you to the command line..).
* Go to the repository directory
* Execute `patch -p0 --dry-run -i patchfile.diff`
* If it works out, remove the --dry-run

The difference between svn and git patches is that by default svn 
doesn't prefix any path (all references start with typo3/):
--- typo3/... (rev 1234)
+++ typo3/... (working copy)
  while git adds a/b prefixes for version a and version b
--- a/typo3/...
+++ b/typo3/...
The -p parameter enables you to strip N directory levels while applying 
a patch.

Kind regards
Steffen

-- 
Steffen Gebert
TYPO3 v4 Core Team Member

TYPO3 .... inspiring people to share!
Get involved: http://typo3.org