Difference between revisions of "Activity Team/Git Migration"

From Sugar Labs
Jump to navigation Jump to search
 
(24 intermediate revisions by 12 users not shown)
Line 1: Line 1:
 +
<noinclude>{{GoogleTrans-en}}{{TeamHeader|Activity Team}}{{TOCright}}</noinclude>
 +
 +
How to migrate activity source control from laptop.org to sugarlabs.org.
 +
 
== Import a module from dev.laptop.org ==
 
== Import a module from dev.laptop.org ==
  
Line 4: Line 8:
 
* '''Log in''' and [http://git.sugarlabs.org/projects/new create a new project] from the projects page (please use '''only lower case''', e.g. sugar, turtleart, sugar-toolkit).
 
* '''Log in''' and [http://git.sugarlabs.org/projects/new create a new project] from the projects page (please use '''only lower case''', e.g. sugar, turtleart, sugar-toolkit).
 
* '''Clone''' your git module from dev.laptop.org, e.g.
 
* '''Clone''' your git module from dev.laptop.org, e.g.
−
  git-clone git://dev.laptop.org/projects/pippy-activity
+
  git clone git://dev.laptop.org/projects/pippy-activity
 
* '''See''' all the remote branches with:
 
* '''See''' all the remote branches with:
 
  git remote show origin
 
  git remote show origin
Line 11: Line 15:
 
* '''Push''' it to git.sugarlabs.org with something like:
 
* '''Push''' it to git.sugarlabs.org with something like:
  
−
  git push gitorious@git.sugarlabs.org:sugar/mainline.git --mirror
+
  git push gitorious@git.sugarlabs.org:pippy-activity/mainline.git  
  
 
* '''Add''' the pootle user as a committer (from the "add committer" link on the mainline page) and send mail to [[User:SayaminduDasgupta|Sayamindu]], to point pootle to new remote.
 
* '''Add''' the pootle user as a committer (from the "add committer" link on the mainline page) and send mail to [[User:SayaminduDasgupta|Sayamindu]], to point pootle to new remote.
Line 17: Line 21:
 
* '''Make sure''' that sugar-jhbuild points to the new repository (ask someone to do it for you if you have no access)
 
* '''Make sure''' that sugar-jhbuild points to the new repository (ask someone to do it for you if you have no access)
  
−
== Clone a module from git.sugarlabs.org ==
+
== See also ==
−
Instructions on how to clone a project from the git repositories of sugarlabs.org can be found at the project's repos/mainline page, for example for [http://git.sugarlabs.org/projects/sugar-jhbuild/repos/mainline sugar-jhbuild]. And here is an example:
 
−
 
 
−
git clone git://git.sugarlabs.org/sugar-jhbuild/mainline.git sugar-jhbuild
 
−
 
 
−
== Git commit message guidelines ==
 
−
 
 
−
* Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for example, use the first line on the Subject: line and the rest of the commit in the body. The git-shortlog command the we use to write the release notes will strip the more detailed description.
 
−
 
 
−
* If your commit does fix a certain bug make sure that the summarizing line contains the bug number prepended by a '#' at the end of the line (e.g. #14). It is implied that you mean the Sugar Labs trac instance. If not please prepend an identifier like OLPC#123 and RH#456.
 
−
 
 
−
* Start your commit message with a capital letter.
 
−
 
 
−
* Suffix no dot at the end of the summarizing line.
 
  
−
* Fixes for typing errors and pylint fixes happen quite often. Just mark them _Typo and respectively _Pylint for easier reading.
+
*A [[Activity Team/Git FAQ|Git/Gitorious FAQ]]
 +
*[http://cgit.sugarlabs.org/ cgit] interface for git.sugarlabs.org
 +
*http://wiki.sugarlabs.org/go/Activity_Team/Git_Activity_Maintainer_Walkthrough
 +
*http://people.sugarlabs.org/Tgillard/git-from-bottom-up.pdf
 +
[[Category:Activity Team]]

Latest revision as of 06:58, 3 September 2011

Team Home   ·   Join   ·   Contacts   ·   Resources   ·   FAQ   ·   Roadmap   ·   To Do   ·   Meetings

How to migrate activity source control from laptop.org to sugarlabs.org.

Import a module from dev.laptop.org

git clone git://dev.laptop.org/projects/pippy-activity
  • See all the remote branches with:
git remote show origin
  • Check out the remote branches you want to migrate, e.g.
git checkout -b sucrose-0.82 origin/sucrose-0.82
  • Push it to git.sugarlabs.org with something like:
git push gitorious@git.sugarlabs.org:pippy-activity/mainline.git
  • Add the pootle user as a committer (from the "add committer" link on the mainline page) and send mail to Sayamindu, to point pootle to new remote.
  • Notify sugar-devel about the move.
  • Make sure that sugar-jhbuild points to the new repository (ask someone to do it for you if you have no access)

See also

Retrieved from "https://wiki.sugarlabs.org/index.php?title=Activity_Team/Git_Migration&oldid=68978"