Git-svn - Revision history

Esden at 01:16, 10 March 2011

2011-03-10T01:16:01Z

← Older revision		Revision as of 19:16, 9 March 2011
Line 34:		Line 34:
	Gitk is your friend if you want to visualise all branches and history:		Gitk is your friend if you want to visualise all branches and history:
	gitk --all		gitk --all

			[[Category:Software]] [[Category:Developer_Documentation]]

Flixr at 21:41, 22 October 2010

2010-10-22T21:41:53Z

← Older revision		Revision as of 15:41, 22 October 2010
Line 3:		Line 3:

	== Get the code ==		== Get the code ==
	~~=== Clone a git mirror ===~~		First clone the master repo from github as described [[Git\|here]].
	~~See~~ the [[Git ~~git page~~]] ~~for that~~.

	If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under github/svn/*.		If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under github/svn/*.

Flixr: update and remove old info regarding cloning directly from svn

2010-10-22T21:40:31Z

update and remove old info regarding cloning directly from svn

@@ Line 4: / Line 4: @@
 == Get the code ==
 === Clone a git mirror ===
-If you don't want to wait for ever when cloning the paparazzi3 subversion repository you can clone an already converted repository from [http://github.com/ github].
+See the [[Git git page]] for that.
- git clone -o github git://github.com/paparazzi/paparazzi3.git
-If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under origin/svn/*.
+If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under github/svn/*.
 To update from this github mirror just run
   git fetch
@@ Line 28: / Line 28: @@
   git pull
 or to get all the changes (including the ones from the svn branches) without merging the in run
-  git fetch origin
+  git fetch github
 To update directly from svn run
@@ Line 35: / Line 35: @@
 Gitk is your friend if you want to visualise all branches and history:
   gitk --all

Flixr: update git-svn info regarding the new git master repo

2010-10-22T21:34:20Z

update git-svn info regarding the new git master repo

← Older revision		Revision as of 15:34, 22 October 2010
Line 5:		Line 5:
	=== Clone a git mirror ===		=== Clone a git mirror ===
	If you don't want to wait for ever when cloning the paparazzi3 subversion repository you can clone an already converted repository from [http://github.com/ github].		If you don't want to wait for ever when cloning the paparazzi3 subversion repository you can clone an already converted repository from [http://github.com/ github].
	git clone git://github.com/~~flixr~~/~~paparazzi~~.git		git clone -o github git://github.com/paparazzi/paparazzi3.git
	If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under origin/svn/*.		If you list the remote branches with '''git branch -r''', you can see that you now have the subversion branches under origin/svn/*.
	To update from this github mirror just run		To update from this github mirror just run
Line 14:		Line 14:
	git config svn.authorsfile .git/svnauthorsfile		git config svn.authorsfile .git/svnauthorsfile
	Since you only have the commits but not the SVN metadata you need to rebuild it. First make the all refs look just like they would look from a fresh import using git update-ref.		Since you only have the commits but not the SVN metadata you need to rebuild it. First make the all refs look just like they would look from a fresh import using git update-ref.
	To do this for all branches listed under ~~origin~~/svn/ you can run this small script:		To do this for all branches listed under github/svn/ you can run this small script:
	git for-each-ref refs/remotes/~~origin~~/svn/ \| cut -d / -f 5- \|		git for-each-ref refs/remotes/github/svn/ \| cut -d / -f 5- \|
	while read ref		while read ref
	do		do
	git update-ref refs/remotes/svn/"$ref" ~~origin~~/svn/"$ref"		git update-ref refs/remotes/svn/"$ref" github/svn/"$ref"
	done		done
	Tell git where to find the SVN repository and rebuild the index:		Tell git where to find the SVN repository and rebuild the index:

Flixr: Git moved to Git-svn: making a new page regarding git only, this one is about using git against the svn repo

2010-10-21T18:30:12Z

Git moved to Git-svn: making a new page regarding git only, this one is about using git against the svn repo

← Older revision	Revision as of 12:30, 21 October 2010
(No difference)

Flixr: added link to git screencast

2010-10-19T17:01:26Z

added link to git screencast

← Older revision		Revision as of 11:01, 19 October 2010
Line 1:		Line 1:
	How to use [http://git-scm.com/ git] with the paparazzi subversion repository. See the [http://git.or.cz/course/svn.html Git - SVN crash course] for an introduction into git for svn users or have a look the pretty comprehensive [http://utsl.gen.nz/talks/git-svn/intro.html git-svn intro] for how to use git together with svn		How to use [http://git-scm.com/ git] with the paparazzi subversion repository. See the [http://git.or.cz/course/svn.html Git - SVN crash course] for an introduction into git for svn users or have a look the pretty comprehensive [http://utsl.gen.nz/talks/git-svn/intro.html git-svn intro] for how to use git together with svn.
			To get an understanding off the git internals the [http://blip.tv/file/4094854 video Getting Git] is excellent.

	== Get the code ==		== Get the code ==

Flixr: /* Get ignore information from svn */

2010-09-23T17:22:32Z

Get ignore information from svn

← Older revision		Revision as of 11:22, 23 September 2010
Line 54:		Line 54:

	== Get ignore information from svn ==		== Get ignore information from svn ==
	~~Tell~~ git to ignore files with the svn:ignore property:		There is already a '''.gitignore''' file in the repository, so you won't need to do this.

			If you still want to tell git to ignore files with the svn:ignore property:
	git svn show-ignore >> .git/info/exclude		git svn show-ignore >> .git/info/exclude
	Or just ~~write~~ anything you want to ignore ~~in a~~ '''.gitignore''' file.		Or just add anything you want to ignore to the '''.gitignore''' file.

Aerovista at 20:32, 21 September 2010

2010-09-21T20:32:41Z

← Older revision		Revision as of 14:32, 21 September 2010
Line 1:		Line 1:
	How to use git with the paparazzi subversion repository. See the [http://git.or.cz/course/svn.html Git - SVN crash course] for an introduction into git for svn users or have a look the pretty comprehensive [http://utsl.gen.nz/talks/git-svn/intro.html git-svn intro] for how to use git together with svn		How to use [http://git-scm.com/ git] with the paparazzi subversion repository. See the [http://git.or.cz/course/svn.html Git - SVN crash course] for an introduction into git for svn users or have a look the pretty comprehensive [http://utsl.gen.nz/talks/git-svn/intro.html git-svn intro] for how to use git together with svn

	== Get the code ==		== Get the code ==

Flixr: fix script

2010-01-28T09:47:50Z

fix script

← Older revision		Revision as of 03:47, 28 January 2010
Line 14:		Line 14:
	Since you only have the commits but not the SVN metadata you need to rebuild it. First make the all refs look just like they would look from a fresh import using git update-ref.		Since you only have the commits but not the SVN metadata you need to rebuild it. First make the all refs look just like they would look from a fresh import using git update-ref.
	To do this for all branches listed under origin/svn/ you can run this small script:		To do this for all branches listed under origin/svn/ you can run this small script:
	git for-each-ref refs/remotes/origin/svn/ \| cut -d / -f 4- \|		git for-each-ref refs/remotes/origin/svn/ \| cut -d / -f 5- \|
	while read ref		while read ref
	do		do
	git update-ref refs/remotes/svn/"$ref" origin/"$ref"		git update-ref refs/remotes/svn/"$ref" origin/svn/"$ref"
	done		done
	Tell git where to find the SVN repository and rebuild the index:		Tell git where to find the SVN repository and rebuild the index:

Flixr: fix typo in script

2010-01-25T14:30:03Z

fix typo in script

← Older revision		Revision as of 08:30, 25 January 2010
Line 17:		Line 17:
	while read ref		while read ref
	do		do
	git update-ref ~~ref~~/remotes/svn/"$ref" origin/"$ref"		git update-ref refs/remotes/svn/"$ref" origin/"$ref"
	done		done
	Tell git where to find the SVN repository and rebuild the index:		Tell git where to find the SVN repository and rebuild the index:
Line 33:		Line 33:

	Gitk is your friend if you want to visualise all branches and history:		Gitk is your friend if you want to visualise all branches and history:
	gitk --all		gitk --all

	=== Import directly from subversion repository ===		=== Import directly from subversion repository ===