Changes between Version 4 and Version 5 of Notes/Subversion/Importing

Timestamp:

11/22/07 19:56:02 (17 years ago)

Author:

VincentMcIntyre

Comment:

try to document the import process

Notes/Subversion/Importing

@@ -6 +6 @@
 
 === Initial Import ===
-Just importing the miriad tree as it stands is unsatisfactory, because we lose the revision history.
+Just importing the miriad tree as it stands is unsatisfactory, because we lose the revision history. So we use {{{cvs2svn}}}.
 
 '''Note:''' there is a [http://cvs2svn.tigris.org/issues/buglist.cgi?target_milestone=---&issue_status=UNCONFIRMED&issue_status=NEW&issue_status=STARTED&issue_status=REOPENED&issue_status=RESOLVED&issue_status=VERIFIED&issue_status=CLOSED&field0-0-0=longdesc&type0-0-0=substring&value0-0-0=file%20already%20exists&field0-0-1=short_desc&type0-0-1=substring&value0-0-1=file%20already%20exists&field0-0-2=status_whiteboard&type0-0-2=substring&value0-0-2=file%20already%20exists bug] in the version of {{{cvs2svn}}} available in the Debian ''sarge'' release that causes the import to die partway through. The version available in Debian ''etch'' works correctly.
+
 {{{
  % mkdir miriad
  % rsync -av /nfs/atapplic/miriad/ miriad/
- % cvs2svn --dumponly --dumpfile=20071123.svndump miriad
 
- # assuming we have a repo at /srv/svn/projects/miriad
- % svnadmin load /srv/svn/projects/miriad < 20071123.svndump
- % 
- # --dumponly is useful for importing a CVS into an existing SVN
+ # method 1
+ # we'll create a new repository in a directory named 'svnmiriad'
+ % cvs2svn -s svnmiriad  miriad
+
+ # method 2
+ # we can create an empty repository named 'svnmiriad' and load via a dumpfile
+ % cvs2svn --dumpfile=20071123.svndump miriad
+ % svnadmin load svnmiriad < 20071123.svndump
+
+ # method 3
+ # add to an existing repository
+ % svnadmin create svnmiriad
+ % cvs2svn --existing-repos -s svnmiriad miriad
+
 }}}
-To do later imports
+
+To do later imports, we would have to do something like this:
 {{{
   % mkdir miriad2
-  % cvs2svn --dumponly --dumpfile=20071124.svndump miriad2
-  % not sure what comes next. I think
+  % rsync -a /nfs/atapplic/miriad/ miriad2/
+  # create a new repos
+  % cvs2svn -s svnmiriad2 miriad2
+  # assuming a repository named 'svnmiriad'
+  % svn merge -rN:M svnmiriad2 svnmiriad  ???
 }}}