Revision: 72462
http://sourceforge.net/p/brlcad/code/72462
Author: starseeker
Date: 2019-02-18 19:25:47 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
fix the writing of blobs with CRLF to match the git sha calculation, skip
premature tagging of 7-12-2
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-02-18
18:23:32 UTC (rev 72461)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-02-18
19:25:47 UTC (rev 72462)
@@ -244,7 +244,7 @@
std::string crlf_buff;
std::ostringstream cf(crlf_buff);
for (int i = 0; i < node.text_content_length; i++) {
- if (buffer[i] == '\n') {
+ if (buffer[i] == '\n' && (i == 0 || buffer[i-1] != '\r')) {
cf << '\r' << '\n';
} else {
cf << buffer[i];
@@ -826,7 +826,7 @@
int is_tag;
std::string mproject, cbranch, mlocal_path, ctag;
node_path_split(node.copyfrom_path, mproject, cbranch, ctag,
mlocal_path, &is_tag);
- if (mlocal_path != node.local_path) {
+ if ((mlocal_path != node.local_path) && (cbranch == node.branch)) {
have_real_rename = 1;
}
}
@@ -931,8 +931,8 @@
}
} else {
std::cout << "Warning(r" << rev.revision_number << ") -
skipping " << node.path << " - no git applicable change found.\n";
+ continue;
}
- continue;
}
switch (node.action) {
@@ -1013,11 +1013,17 @@
if (rev.revision_number > rev_num_max) return;
+ if (rev.revision_number == 30760) {
+ std::cout << "Skipping r30760 - premature tagging of rel-7-12-2.
Will be tagged by 30792\n";
+ continue;
+ }
+
if (rev.revision_number == 36472) {
std::cout << "Skipping r36472 - branch rename, handled by mapping
the original name in the original commit (dmtogl-branch) to the desired branch
name (dmtogl)\n";
continue;
}
+
if (rev.revision_number >= rev_num_min) {
#if 0
std::cout << "Processing revision " << rev.revision_number << "\n";
@@ -1331,9 +1337,10 @@
std::ifstream infile(argv[1]);
- std::ofstream outfile("r29887-rHEAD.fi", std::ios::out | std::ios::binary);
+ std::ofstream outfile("brlcad-svn-export.fi", std::ios::out |
std::ios::binary);
if (!outfile.good()) return -1;
- rev_fast_export(infile, outfile, 29887, 73000);
+ //rev_fast_export(infile, outfile, 29887, 30854);
+ rev_fast_export(infile, outfile, 29887, 30856);
outfile.close();
#if 0
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
