Slicer:git-svn - Revision history

JChris.FillionR at 04:12, 24 March 2020

2020-03-24T04:12:51Z

Pieper: /* Committing back to svn */

2017-02-01T20:38:10Z

Committing back to svn

Max.smolens: Fix typo

2015-08-05T13:34:16Z

Fix typo

Fedorov: /* Committing back to svn */

2015-03-04T21:12:38Z

Committing back to svn

Nicole: /* Complete topic approach */

2013-04-09T15:17:00Z

Complete topic approach

Nicole: /* Cherry-pick approach */

2013-04-09T15:16:35Z

Cherry-pick approach

JChris.FillionR: /* Complete topic approach */

2013-04-02T21:03:14Z

Complete topic approach

Fedorov: /* More git resources */

2013-02-21T14:19:12Z

More git resources

JChris.FillionR: /* More git resources */

2013-01-30T03:59:04Z

More git resources

JChris.FillionR at 00:35, 30 January 2013

2013-01-30T00:35:06Z

@@ Line 1: / Line 1: @@
-== Intro ==
+{{Historical}}
 As of 2011 the 3D Slicer projects use subversion (svn) for the main repositories.  Many project are switching to git and many developers prefer it, but feedback is also mixed about just how easy it is for a large distributed team to standardize on a set of workflows and stick with them (much anecdotal evidence and hearsay omitted).
@@ Line 5: / Line 7: @@
 But, individual developers or groups can use git for their work and then commit the results back to svn.  The info here provides a brief set of hints for this.
-== Prerequisites ==
+==Prerequisites==
 Install git and git-svn on your machine (git svn is an add-on package, requiring an extra apt-get install on ubuntu).
@@ Line 16: / Line 18: @@
 See http://man.github.com/git/git-svn.html
-== Make a local clone of Slicer ==
+==Make a local clone of Slicer==
 Then, check out a read-only version of Slicer your own copy and associate it with slicer's svn:
@@ Line 28: / Line 30: @@
 Note that <code>git://github.com/Slicer/Slicer.git</code> is read-only, no one can push on it. A robot synchronizes the svn repository with the github repository (svn ->git, not git -> svn).
-== Optional - push it to your own github repository ==
+==Optional - push it to your own github repository==
 First, fork the Slicer/Slicer.git project on github into your own account (this will save space on github):
-* Go to [https://github.com/Slicer/Slicer https://github.com/Slicer/Slicer]
-* and click on the ''Fork'' button.
+*Go to https://github.com/Slicer/Slicer
 Then set up a 'git remote' (basically an alias) to your git hub repository:
@@ Line 44: / Line 47: @@
   git push pieperSlicer4 master
-== Create a topic branch ==
+==Create a topic branch==
 The 'branchy workflow' method of git is cool because all the changes related to a topic (meaning bug fix, feature addition, refactoring...) can be encapsulated in a lightweight branch that you can easily share with others.
@@ Line 77: / Line 80: @@
 then you can push into that branch from the new machine as well.
-== Committing back to svn ==
+==Committing back to svn==
 Once you have the code from the branch just the way you want it, you can put it directly back into svn (do not merge it back into master).
@@ Line 103: / Line 106: @@
   git push pieperSlicer4 :testbranch
-== How it looks in svn ==
+==How it looks in svn==
 These are normal svn operations, so once they are commited (with dcommit) they show up as normal (example here is from Slicer3):
@@ Line 114: / Line 117: @@
-== Alternate Import from svn with History ==
+==Alternate Import from svn with History==
 This will pull the git-svn hash history from the existing repo, (avoids calculating from the beginning), then update to the current svn revision.
@@ Line 136: / Line 139: @@
-== Pull request from a git-svn tracking branch ==
+==Pull request from a git-svn tracking branch==
 If you have been running git-svn for any length of time, the commit hash history will have diverged from the Official Github history at http://github.com/Slicer/slicer. This will result in very dirty pull requests from your fork (no, you really don't want to merge 803 commits!)
@@ Line 156: / Line 159: @@
-== Integrating topic from external contributor ==
+==Integrating topic from external contributor==
 The idea is to use the option <code>--add-author-from</code> associated with <code>git svn dcommit</code> so that a <code>From:</code> field is added to the commit message.
@@ Line 164: / Line 167: @@
 </pre>
-=== Single patch approach ===
+===Single patch approach===
    git checkout master
@@ Line 174: / Line 177: @@
    git svn dcommit --add-author-from
-=== Cherry-pick approach ===
+===Cherry-pick approach===
    git checkout master
@@ Line 185: / Line 188: @@
    git svn dcommit --add-author-from
-=== Complete topic approach ===
+===Complete topic approach===
    git checkout master
@@ Line 196: / Line 199: @@
    git svn dcommit --add-author-from
-== More git resources ==
+==More git resources==
 (There is more info on git than anyone can really digest - unfortunately I often find that the information you need is not exactly described by the man page or tutorial you are currently reading.  The only solution is to read widely, don't believe everything you read, skip the parts that seem too wordy or abstract, and experiment a lot.)
@@ Line 202: / Line 205: @@
 Here are a bunch of links that may help:
-* [http://marklodato.github.com/visual-git-guide/index-en.html A Visual Git Reference]
+*[http://marklodato.github.com/visual-git-guide/index-en.html A Visual Git Reference]
-* https://cirl.berkeley.edu/mb312/gitwash/index.html
+*https://cirl.berkeley.edu/mb312/gitwash/index.html
-* http://www.itk.org/Wiki/ITKContribute
+*http://www.itk.org/Wiki/ITKContribute
-* http://www.dinnermint.org/tutorial/dead-simple-git-workflow-for-agile-teams/
+*http://www.dinnermint.org/tutorial/dead-simple-git-workflow-for-agile-teams/
-* http://www.vtk.org/Wiki/VTK/Git
+*http://www.vtk.org/Wiki/VTK/Git
-* http://public.kitware.com/Wiki/Git/Workflow/Topic
+*http://public.kitware.com/Wiki/Git/Workflow/Topic
-* http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/
+*http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/
-* http://gitref.org/
+*http://gitref.org/
-* http://tom.preston-werner.com/2009/05/19/the-git-parable.html
+*http://tom.preston-werner.com/2009/05/19/the-git-parable.html
-* http://www-cs-students.stanford.edu/~blynn/gitmagic/ch02.html
+*http://www-cs-students.stanford.edu/~blynn/gitmagic/ch02.html
-* http://github.com/pkgwdemo/bloomdemo
+*http://github.com/pkgwdemo/bloomdemo
-* http://marklodato.github.com/visual-git-guide/#merge
+*http://marklodato.github.com/visual-git-guide/#merge
-* [http://pcottle.github.com/learnGitBranching/ Git branching visual tutorial]
+*[http://pcottle.github.com/learnGitBranching/ Git branching visual tutorial]

@@ Line 87: / Line 87: @@
 then you can commit
-  git svn dcommit
+  git svn dcommit --add-author-from
 Note: you may need to use git commit --amend to edit the commit message to add "ENH:", "COMP:", "BUG:" etc. to be compatible with slicer svn.

@@ Line 89: / Line 89: @@
   git svn dcommit
-Note: you may need to use git commit --ammend to edit the commit message to add "ENH:", "COMP:", "BUG:" etc. to be compatible with slicer svn.
+Note: you may need to use git commit --amend to edit the commit message to add "ENH:", "COMP:", "BUG:" etc. to be compatible with slicer svn.
 Since we're done with this branch, we can clean it up:

@@ Line 81: / Line 81: @@
 Once you have the code from the branch just the way you want it, you can put it directly back into svn (do not merge it back into master).
-Bring your local master in sync with svn by doing, essentially, the same as 'svn update':
+While in the branch with the changes you want to commit, bring it in sync with svn by doing, essentially, the same as 'svn update':
   git svn rebase

@@ Line 189: / Line 189: @@
    git checkout master
    git svn rebase
-   git remote add laurent git://github.com/laurent/Slicer
+   git remote add laurent git://github.com/lchauvin/Slicer
    git fetch laurent
    git checkout -b 2885-add-ruler-projection-on-2D-viewers laurent/2885-add-ruler-projection-on-2D-viewers

← Older revision		Revision as of 14:19, 21 February 2013
Line 213:		Line 213:
	* http://github.com/pkgwdemo/bloomdemo		* http://github.com/pkgwdemo/bloomdemo
	* http://marklodato.github.com/visual-git-guide/#merge		* http://marklodato.github.com/visual-git-guide/#merge
		+	* [http://pcottle.github.com/learnGitBranching/ Git branching visual tutorial]

@@ Line 154: / Line 154: @@
    git push origin myFeature
 It should now be possible to issue a clean pull request against Slicer/slicer with *only* the commits in myFeature listed by github.
 == More git resources ==