Revision: 72248
http://sourceforge.net/p/brlcad/code/72248
Author: starseeker
Date: 2019-01-21 22:24:55 +0000 (Mon, 21 Jan 2019)
Log Message:
-----------
Add some notes
Modified Paths:
--------------
brlcad/trunk/misc/CMakeLists.txt
brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx
Added Paths:
-----------
brlcad/trunk/misc/repoconv/README
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2019-01-21 16:13:09 UTC (rev 72247)
+++ brlcad/trunk/misc/CMakeLists.txt 2019-01-21 22:24:55 UTC (rev 72248)
@@ -106,6 +106,7 @@
profont/profont-IIx-charmap.png
profont/profont_IIx_readme.pdf
profont/readme.txt
+ repoconv/README
repoconv/cvs2git/authormap
repoconv/cvs2git/README.sh
repoconv/cvs2git/repaired/sphflake.pix,v
Added: brlcad/trunk/misc/repoconv/README
===================================================================
--- brlcad/trunk/misc/repoconv/README (rev 0)
+++ brlcad/trunk/misc/repoconv/README 2019-01-21 22:24:55 UTC (rev 72248)
@@ -0,0 +1,23 @@
+Notes concerning joining of cvs and svn histories in git:
+
+In order to define a fast import stream git can append to the cvs conversion,
+the svn export should use the marks for various objects and commits used by the
+cvs history. This list can be generated via git fast-export --all of the cvs
+conversion while specifying a file in which to record the map:
+
+cd brlcad_cvs_git
+git fast-export --all --export-marks=../marks_file > ../export.fi
+cd ..
+mkdir repo_dir && cd repo_dir
+git init
+cat ../export.fi | git fast-import
+
+A quick experiment using a manually adjusted incremenal output from
+https://github.com/satori/git-svn-fast-import indicates the from property will
+have to be defined in the new commits respecting the above marks, and new mark
+ids should increment starting from the maximum mark in the marks_file
+
+cat ../29887.fi | git fast-import --import-marks=../marks_file
+
+Consequently, the svn fast-export code will have to be aware of the marks_file
+contents when it generates its output.
Property changes on: brlcad/trunk/misc/repoconv/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx 2019-01-21 16:13:09 UTC
(rev 72247)
+++ brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx 2019-01-21 22:24:55 UTC
(rev 72248)
@@ -276,7 +276,7 @@
std::string new_md5 = md5_hash_hex(new_content.c_str(),
new_content.length());
std::string new_sha1 = sha1_hash_hex(new_content.c_str(),
new_content.length());
if (text_content_md5 != new_md5 || text_content_sha1 != new_sha1) {
- std::cout << "path: " << npath << "\n";
+ std::cout << "Altered: " << npath << "\n";
std::cout << "Original md5 : " << text_content_md5 << "\n";
std::cout << "Calculated md5 : " << new_md5 << "\n";
std::cout << "Original sha1 : " << text_content_sha1 << "\n";
@@ -284,12 +284,13 @@
md5_map.insert(std::pair<std::string,std::string>(text_content_md5, new_md5));
sha1_map.insert(std::pair<std::string,std::string>(text_content_sha1,
new_sha1));
} else {
+ std::cout << "Unaltered: " << npath << "\n";
new_content = std::string("");
}
// TODO - build maps from old hashes to new, write out new hashes
in dump
} else {
- std::cout << "Binary file: " << npath << "\n";
+ std::cout << "Binary: " << npath << "\n";
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
