Translations
Info
All page names need to be in English.
en da  de  fr  it  ja  km  nl  ru  zh

Merge Repositories

From TYPO3Wiki
Jump to: navigation, search

notice - This information is outdated


Introduction

This describes how to merge an external repository into the the main repository. The use case for this is to get the results of external projects to the TYPO3 Core.

Actions

Switch to the branch that shall hold the results of an external repository (here we want everything to be included in master)
shell script:
$ git checkout master
Already on 'master'

Add the remote repository which can be accessed with the name workspaces and fetch it's data

shell script:
$ git remote add workspaces git://git.typo3.org/TYPO3CMS/CoreProjects/workspaces/workspaces.git
$ git fetch workspaces
From git://git.typo3.org/TYPO3CMS/CoreProjects/workspaces/workspaces
 * [new branch]      4.5        -> workspaces/4.5
 * [new branch]      master     -> workspaces/master

Show the available branches and see the new workspaces/* branches at the bottom

shell script:
$ git branch -ar
  origin/HEAD -> origin/master
  origin/TYPO3_4-4
  origin/TYPO3_4-5
  origin/master
  workspaces/4.5
  workspaces/master

Pull the results of the external repository workspaces and its branch master to the current branch (we are also on master)

shell script:
$ git pull -s subtree workspaces master
From git://git.typo3.org/TYPO3CMS/CoreProjects/workspaces/workspaces
 * branch            master     -> FETCH_HEAD
Removing typo3/sysext/workspaces/last_synched_target
Merge made by subtree.
 typo3/sysext/workspaces/ChangeLog                  |  105 ++++++++-----
 .../WorkspaceSelectorToolbarItem.php               |    2 +-
 .../Classes/Controller/PreviewController.php       |   23 ++--
 .../Classes/Controller/ReviewController.php        |   17 ++-
 .../Classes/ExtDirect/AbstractHandler.php          |    7 +-
 .../sysext/workspaces/Classes/ExtDirect/Server.php |    4 +
 .../workspaces/Classes/ExtDirect/ToolbarMenu.php   |    3 +-
 .../sysext/workspaces/Classes/Service/Fehooks.php  |    5 +-
 .../sysext/workspaces/Classes/Service/GridData.php |    2 +-
 .../workspaces/Classes/Service/Workspaces.php      |   78 +++++++---
 .../{doc/manual.sxw => Documentation/manual.odt}   |  Bin 732917 -> 735004 bytes
 typo3/sysext/workspaces/Documentation/manual.pdf   |  Bin 0 -> 784379 bytes
 .../workspaces/{doc => Documentation}/manual.sxw   |  Bin 732917 -> 733917 bytes
 .../Resources/Private/Layouts/module.html          |    2 +-
 .../Resources/Private/Layouts/popup.html           |    3 +-
 .../Private/Templates/Review/SingleIndex.html      |    6 +-
 .../Resources/Public/Images/slider-bg.png          |  Bin 164 -> 164 bytes
 .../Resources/Public/Images/slider-thumb.png       |  Bin 433 -> 433 bytes
 .../Resources/Public/JavaScript/component.js       |   15 ++-
 .../Resources/Public/JavaScript/preview.js         |  167 +++++++++++++-------
 .../Resources/Public/JavaScript/workspacemenu.js   |    6 +-
 .../Resources/Public/JavaScript/workspaces.js      |   10 +-
 typo3/sysext/workspaces/ext_emconf.php             |    5 +-
 typo3/sysext/workspaces/ext_localconf.php          |    1 +
 typo3/sysext/workspaces/ext_tables.php             |    3 +-
 typo3/sysext/workspaces/last_synched_target        |    1 -
 26 files changed, 319 insertions(+), 146 deletions(-)
 copy typo3/sysext/workspaces/{doc/manual.sxw => Documentation/manual.odt} (94%)
 create mode 100644 typo3/sysext/workspaces/Documentation/manual.pdf
 rename typo3/sysext/workspaces/{doc => Documentation}/manual.sxw (95%)
 mode change 100644 => 100755 typo3/sysext/workspaces/Resources/Public/Images/slider-bg.png
 mode change 100644 => 100755 typo3/sysext/workspaces/Resources/Public/Images/slider-thumb.png
 delete mode 100644 typo3/sysext/workspaces/last_synched_target

Modify the commit message and push the merge to Gerrit

shell script:
$ git commit --amend
$ git push origin HEAD:refs/for/master