Difference between revisions of "Git"

From Scribus Wiki
Jump to: navigation, search
Line 32: Line 32:
 
==Using Scribus Git Repositories==
 
==Using Scribus Git Repositories==
 
To check out the main repository:
 
To check out the main repository:
  git clone git@www1.scribus.net:scribus.git
+
  git clone git@scribus.net:scribus.git
 +
 
 +
The application of the Git Branching and Merging development model to Scribus development includes:
 +
* Using scribus.git repository for community development.
 +
* Using the following naming scheme for the branches:
 +
** master - main developmental branch - merge your feature/fix branches into it.
 +
** release - release / tagging branch.
 +
** trunk - used to synchronize code to and from the git-svn trunk.git repository.
 +
** YOURBRANCH - branch master and develop new features or fix problems before merging into master.

Revision as of 17:53, 31 May 2012

This page provides documentation for the usage of Scribus Git repositories for Scribus development.

Introduction

Scribus Team maintains two code repositories - an internal protected Subversion repository accessible to only experienced core developers that contains a pristine history of Scribus development and a newer Git repository (several of them actually) that enable the Worldwide Scribus Community to easily contribute code to Scribus. We are attempting to follow the successful Git branching development model for the Git repository as explained below.

Access

To obtain access please email your public ssh key to admin@scribus.net or post it somewhere on the web and email or paste the link into #scribus IRC channel. Read the Set up SSH Keys section to learn about creating an acceptable ssh key. Once we accept your key you will be able to verify your access with a ssh git@www1.scribus.net info command. If you have access gitolite will greet you and show the list of repositories accessible to you.

Using Git

There are numerous Git tutorials and books on the web:

Scribus Git Repositories

The full list of Scribus code Git repositories:

  • scribus - The main Scribus git repository with the complete history.
  • trunk - Repository for synchronization with the Subversion trunk.
  • testing - empty repository to practice and learn git.

GSoC 2012 Student repositories:

  • gsoc12pm - Project Manager project repository.
  • gsoc12ux - User Experience project repository.
  • gsoc12xml - New XML File Format project repository.
  • gsoc12trunk - Merge and synchronization repository for GSoC 2012.

Using Scribus Git Repositories

To check out the main repository:

git clone git@scribus.net:scribus.git

The application of the Git Branching and Merging development model to Scribus development includes:

  • Using scribus.git repository for community development.
  • Using the following naming scheme for the branches:
    • master - main developmental branch - merge your feature/fix branches into it.
    • release - release / tagging branch.
    • trunk - used to synchronize code to and from the git-svn trunk.git repository.
    • YOURBRANCH - branch master and develop new features or fix problems before merging into master.