Migrating VCS - Revision history

Jpye at 01:52, 5 March 2015

2015-03-05T01:52:27Z

← Older revision		Revision as of 01:52, 5 March 2015
Line 1:		Line 1:
	Some notes on migrating between version control systems. '''WORK IN PROGRESS'''.		Some notes on migrating between version control systems. '''WORK IN PROGRESS'''.

	~~'''~~To migrate a Bazaar repository to Git~~'''~~		===To migrate a Bazaar repository to Git===

	Source: http://librelist.com/browser/cville/2010/2/9/migrate-repository-bzr-to-git/		Source: http://librelist.com/browser/cville/2010/2/9/migrate-repository-bzr-to-git/
Line 25:		Line 25:
	git reset HEAD		git reset HEAD

	~~'''~~Try to replay a Git repo into a new Subversion repo~~'''~~		===Try to replay a Git repo into a new Subversion repo===

	Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion		Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion
Line 42:		Line 42:
	This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.		This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.

	== To recreate a branch in SVN when only the HEAD code from the branch is available ==		=== To recreate a branch in SVN when only the HEAD code from the branch is available ===

	After a server failure, we lost the revision history of several branches in our repository, but because of working copies on other machines, we still had the HEAD revision code.		After a server failure, we lost the revision history of several branches in our repository, but because of working copies on other machines, we still had the HEAD revision code.

Jpye: /* To recreate a branch in SVN when only the HEAD code from the branch is available */

2015-03-05T01:50:32Z

To recreate a branch in SVN when only the HEAD code from the branch is available

← Older revision		Revision as of 01:50, 5 March 2015
Line 51:		Line 51:
	svn co http://example.com/svn/repo/branches/b1		svn co http://example.com/svn/repo/branches/b1
	cd b1		cd b1
			rsync -Cva --delete ~/oldwc/ ./

			Then, using a tool such as [http://meldmerge.org/ Meld], open the <tt>b1</tt> directory and any files marked 'missing' can be removed (ie <tt>svn rm</tt>). You can do this easily using Meld, and also quickly review the changes made relative to the trunk code to make sure the <tt>rsync</tt> process worked correctly. Any unversioned files present in the <tt>b1</tt> should also be added (ie <tt>svn add</tt>) since they were present in the <tt>~/oldwc</tt> working copy and should now be included in the new <tt>b1</tt> branch.

			Once the new files are added and missing files removed, you can complete the process using\

			svn ci

			And make a comment to record what has been done.

	[[Category:Miscellany]]		[[Category:Miscellany]]

Jpye at 01:44, 5 March 2015

2015-03-05T01:44:00Z

← Older revision		Revision as of 01:44, 5 March 2015
Line 42:		Line 42:
	This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.		This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.

			== To recreate a branch in SVN when only the HEAD code from the branch is available ==

			After a server failure, we lost the revision history of several branches in our repository, but because of working copies on other machines, we still had the HEAD revision code.

			To recreate a branch and import this old working-copy code (assumed to be located in <tt>~/oldwc</tt>), you can use the following steps:

			svn cp http://example.com/svn/repo/trunk http://example.com/svn/repo/branches/b1
			svn co http://example.com/svn/repo/branches/b1
			cd b1


	[[Category:Miscellany]]		[[Category:Miscellany]]

Jpye at 03:58, 17 February 2015

2015-02-17T03:58:50Z

← Older revision		Revision as of 03:58, 17 February 2015
Line 41:		Line 41:

	This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.		This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.

			[[Category:Miscellany]]

Jpye at 03:40, 17 February 2015

2015-02-17T03:40:00Z

← Older revision		Revision as of 03:40, 17 February 2015
Line 40:		Line 40:
	subgit install svn.repo		subgit install svn.repo

	This was tested with a 'linear' repository -- no branches in the original bzr repository.		This final step is the one that takes the time -- took about 10 minutes for our repository of ~3000 commits. This process was tested with a 'linear' repository -- no branches in the original bzr repository. The resulting svn repository has several 'tags' but no 'branches', as expected.

Jpye at 02:57, 17 February 2015

2015-02-17T02:57:31Z

← Older revision		Revision as of 02:57, 17 February 2015
Line 30:		Line 30:

	This approach uses [http://www.subgit.com/ SubGit], which is free to use for open source/academic or 'import' applications.		This approach uses [http://www.subgit.com/ SubGit], which is free to use for open source/academic or 'import' applications.

	Assume we have a 'bare' Git repository at <tt>/path/to/repo.git</tt>:		Assume we have a 'bare' Git repository at <tt>/path/to/repo.git</tt>:

Jpye at 02:57, 17 February 2015

2015-02-17T02:57:19Z

← Older revision		Revision as of 02:57, 17 February 2015
Line 29:		Line 29:
	Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion		Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion

			This approach uses [http://www.subgit.com/ SubGit], which is free to use for open source/academic or 'import' applications.
	Assume we have a 'bare' Git repository at <tt>/path/to/repo.git</tt>:		Assume we have a 'bare' Git repository at <tt>/path/to/repo.git</tt>:

Jpye at 02:54, 17 February 2015

2015-02-17T02:54:49Z

← Older revision		Revision as of 02:54, 17 February 2015
Line 5:		Line 5:
	Source: http://librelist.com/browser/cville/2010/2/9/migrate-repository-bzr-to-git/		Source: http://librelist.com/browser/cville/2010/2/9/migrate-repository-bzr-to-git/

	To convert a bzr repository to git ~~(cwd~~: bzr ~~repo):~~		To convert a bzr repository (<tt>repo-bzr</tt>) to git:
			cd repo-bzr
	git init &&		git init &&
	bzr fast-export `pwd` \| git fast-import &&		bzr fast-export `pwd` \| git fast-import &&

Jpye at 02:54, 17 February 2015

2015-02-17T02:54:08Z

← Older revision		Revision as of 02:54, 17 February 2015
Line 6:		Line 6:

	To convert a bzr repository to git (cwd: bzr repo):		To convert a bzr repository to git (cwd: bzr repo):
	$ git init &&		git init &&
	bzr fast-export `pwd` \| git fast-import &&		bzr fast-export `pwd` \| git fast-import &&
	rm -r .bzr &&		rm -r .bzr &&

Jpye at 02:53, 17 February 2015

2015-02-17T02:53:54Z

← Older revision		Revision as of 02:53, 17 February 2015
Line 28:		Line 28:
	Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion		Source: http://stackoverflow.com/questions/498110/converting-a-repository-from-git-to-subversion

	Assume we have a 'bare' Git repository at </tt>/path/to/repo.git</tt>:		Assume we have a 'bare' Git repository at <tt>/path/to/repo.git</tt>:

	svnadmin create svn-repo		svnadmin create svn-repo