HOW-TO import and export to and from Git and CVS - Revision history

199.209.144.220: /* Importing from CVS into Git */

2012-05-21T22:17:58Z

‎Importing from CVS into Git

Jmacgreg: Undo revision 1515 by Jennifer (talk)

2010-08-04T15:29:04Z

Undo revision 1515 by Jennifer (talk)

Jennifer at 08:07, 4 August 2010

2010-08-04T08:07:52Z

142.58.131.21 at 19:58, 30 April 2010

2010-04-30T19:58:18Z

Juan at 23:56, 18 February 2010

2010-02-18T23:56:08Z

Juan: HOW-TO import/export to/from Git and CVS moved to HOW-TO import and export to and from Git and CVS: should not be using slashes in names

2009-11-28T12:58:26Z

HOW-TO import/export to/from Git and CVS moved to HOW-TO import and export to and from Git and CVS: should not be using slashes in names

Juan: /* export */

2009-11-21T18:49:20Z

‎export

Juan: recommended to update master before cvsexport

2009-11-21T17:29:31Z

recommended to update master before cvsexport

Juan: /* export */

2009-11-21T17:25:53Z

‎export

Juan: /* export */

2009-11-21T17:23:08Z

‎export

@@ Line 11: / Line 11: @@
 $ git cvsimport -d $CVSROOT -C dir_to_create -r cvs -k cvs_module_to_checkout
 </pre>
 = When you encounter problems with the initial import =

@@ Line 2: / Line 2: @@
 = Importing from CVS into Git =
 Fortunately, we can all share one CVS import.  The following commands are set up to run on a server (currently, alperin.ca) and are being pushed to the [http://github.com/pkp "official" PKP Github account].  This means that on your local machine, you only need to follow this how-to: [[HOW-TO check out PKP applications from git]] and do:
 <pre>

@@ Line 2: / Line 2: @@
 = Importing from CVS into Git =
 Fortunately, we can all share one CVS import.  The following commands are set up to run on a server (currently, alperin.ca) and are being pushed to the [http://github.com/pkp "official" PKP Github account].  This means that on your local machine, you only need to follow this how-to: [[HOW-TO check out PKP applications from git]] and do:
 <pre>

← Older revision		Revision as of 19:58, 30 April 2010
Line 66:		Line 66:

	This creates yet another commit in your Git history. The history becomes a little messy for the person doing the commit, because you have a merge commit, the cvs import commit, the cvs import merge, and the update from the official commit. You can, if you really want, reset your master to before you merged in your experiment branch with a git reset --hard and then pull from the official. However, this is purely for esthetics and makes no functional difference.		This creates yet another commit in your Git history. The history becomes a little messy for the person doing the commit, because you have a merge commit, the cvs import commit, the cvs import merge, and the update from the official commit. You can, if you really want, reset your master to before you merged in your experiment branch with a git reset --hard and then pull from the official. However, this is purely for esthetics and makes no functional difference.
		+
		+	test

@@ Line 12: / Line 12: @@
 </pre>
-For simplification on subsequent commands, you can configure the following:
+= When you encounter problems with the initial import =
 <pre>
 $ git config cvsimport.module cvs_module_to_checkout

@@ Line 35: / Line 35: @@
 # this is the equivalent of doing cvs update before you do a commit
 $ git merge --no-ff --log -m "#bugumber# commit message" experiment
-$ git cvsexportcommit -w /path/to/cvs/checkout -u -p -c ORIG_HEAD HEAD
+$ git cvsexportcommit -w /path/to/cvs/checkout -u -p -k -c ORIG_HEAD HEAD
 </pre>
@@ Line 41: / Line 41: @@
 Note 2: that you need a working CVS checkout somewhere in your file system at /path/to/cvs/checkout above.  <br />
 Note 3: Unless you have SSH keys set up, the above command might ask you for your CVS password several times.
 Once you do this, you can wait a while until the change propages across.  The cvsimport command is set to run on the hour, every hour.  So a few minutes after the hour, your change in CVS should exist in the official PKP github repository.  However, if you commit within 10 minutes of the hour, your change will only make it across an hour later because cvsimport ignores commits within the last 10 minutes by default to avoid importing a half-finished commit.

@@ Line 31: / Line 31: @@
 $ git checkout master
 # on master
 $ git merge --no-ff --log -m "#bugumber# commit message" experiment
 $ git cvsexportcommit -w /path/to/cvs/checkout -u -p -c ORIG_HEAD HEAD

← Older revision		Revision as of 17:25, 21 November 2009
Line 40:		Line 40:

	Once you do this, you can wait a while until the change propages across. The cvsimport command is set to run on the hour, every hour. So a few minutes after the hour, your change in CVS should exist in the official PKP github repository. However, if you commit within 10 minutes of the hour, your change will only make it across an hour later because cvsimport ignores commits within the last 10 minutes by default to avoid importing a half-finished commit.		Once you do this, you can wait a while until the change propages across. The cvsimport command is set to run on the hour, every hour. So a few minutes after the hour, your change in CVS should exist in the official PKP github repository. However, if you commit within 10 minutes of the hour, your change will only make it across an hour later because cvsimport ignores commits within the last 10 minutes by default to avoid importing a half-finished commit.
		+
		+	After the change comes across, you can simply do:
		+	<pre>
		+	# on Master branch
		+	$ git pull official master
		+	</pre>
		+
		+	This creates yet another commit in your Git history. The history becomes a little messy for the person doing the commit, because you have a merge commit, the cvs import commit, the cvs import merge, and the update from the official commit. You can, if you really want, reset your master to before you merged in your experiment branch with a git reset --hard and then pull from the official. However, this is purely for esthetics and makes no functional difference.