[TYPO3-core] Incubator troubles
Jigal van Hemert
jigal at xs4all.nl
Wed Nov 30 06:52:37 CET 2011
On 29-11-2011 17:46, Peter Niederlag wrote:
>>> Tip: start over with a clean local branch.
>> You're kidding, right? ;-) Git the ultimate change management tool
>> requires me to throw away my edits and start all over?
> Did I say throw away? I said start over and keep everything in
> "keepmeuntilmyproblemsareresolved". ;)
I think you can read back what you exactly said ;-)
>>> git checkout -b project-graphicslibrary origin/project-graphicslibrary
>> Well, this ^^ is how it started.
>> - create new directory outside the core repository
>> - clone incubator
> now you are on master branch
>> - checkout project graphicslibrary
> How did you checkout?
Right-click in directory Incubator (which was just cloned), TortoiseGit
> Switch/Checkout... Select 'remotes/origin/project-graphicslibrary',
Option "Create New Branch": 'project-graphicslibary', Option "Track".
This worked fine on all Core branches so far
> It seems like somehow you just git a bunch of commits in there that you
> might not want. On the other hand, maybe you even want them. That I just
> can't tell....
Me neither. It would be nice if this incubator branch would be in synch
with master, but it isn't vital I think. As long as we can at some point
in the future extract "my changes" from the rest it's okay.
> Try to analyze the situation and see what the history is, to which
> branches it belongs. Once you find out what you need it is pretty
> straight forward to get in back in shape.
In the log I can find my first commit:
Date: 14-8-2011 13:53:35
[BUGFIX] Failing unit test in tslib_adminPanelTest
Date: 12-8-2011 12:30:19
[BUGFIX] Unit tests for tslib_content query arguments fail
Date: 6-8-2011 11:01:04
[BUGFIX] Old EM: t3lib_DB::exec_INSERTquery errors
** Revision: f200a1b5b8daed8b5e6f62826337e1f19aec18e0
** Date: 27-11-2011 12:29:49
** [FEATURE] Initialize graphics handlers
New interface for graphics analyzers
Date: 9-8-2011 0:38:09
[BUGFIX] Recycler: fix wrong placed bracked on calls to
Date: 8-8-2011 5:58:55
[BUGFIX] RTE Spellchecker dialogue fails to open in IE
On top of it are the 322 or so commits and the latest is the commit
which couldn't be pushed:
Author: Jigal van Hemert
Date: 27-11-2011 16:43:09
Add basic analyzer classes and configuration
Date: 26-10-2011 3:23:13
[BUGFIX] Core calls deprecated ADMCMD_preview()
Date: 10-11-2011 17:19:35
[BUGFIX][!!!] Slider wizard misuses "max" property
> It is hard to do it with the "Glaskugel" though. ;)
I know! I appreciate your attempts. It's always possible to archive the
whole local repository and send it by one of the
big-file-transfer-services if necessary...
> P.S.: I find 'gitk --all' pretty usefull in these cases but dont know
> the win equivalent.
From a google image search I think that TortoiseGit "Show Log" is the
The diff is shown by double-clicking on a file in the third block (below
"Path"). The "Graph" column shows the branching and merging; in this
screenshot there was just a sequence of commits.
It also shows the actions you can perform on each commit, so maybe this
helps your Glaskugel a bit? :-)
Kind regards / met vriendelijke groet,
Jigal van Hemert.
More information about the TYPO3-team-core