Revision: 73045
http://sourceforge.net/p/brlcad/code/73045
Author: starseeker
Date: 2019-05-12 03:11:19 +0000 (Sun, 12 May 2019)
Log Message:
-----------
set branch names, don't nuke rev_gsha1s.txt until we know we can.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-11
17:55:35 UTC (rev 73044)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-12
03:11:19 UTC (rev 73045)
@@ -136,8 +136,7 @@
void write_cached_rev_sha1s()
{
std::map<std::pair<std::string,long int>, std::string>::iterator r_it;
- remove("rev_gsha1s.txt");
- std::ofstream outfile("rev_gsha1s.txt", std::ios::out | std::ios::binary);
+ std::ofstream outfile("rev_gsha1s_tmp.txt", std::ios::out |
std::ios::binary);
if (!outfile.good()) exit(-1);
for (r_it = rev_to_gsha1.begin(); r_it != rev_to_gsha1.end(); r_it++) {
std::string s1 = r_it->first.first;
@@ -150,6 +149,8 @@
outfile << r_it->first.first << "," << r_it->first.second << "," <<
r_it->second << "\n";
}
outfile.close();
+ remove("rev_gsha1s.txt");
+ rename("rev_gsha1s_tmp.txt", "rev_gsha1s.txt");
}
@@ -1138,6 +1139,9 @@
coutfile.close();
+ // Make sure rbranch knows what branch this is. (Hi
r33127...)
+ rbranch = node.tag;
+
continue;
}
if (rev.revision_number == edited_tag_maxr) {
@@ -1211,6 +1215,9 @@
coutfile.close();
+ // Make sure rbranch knows what branch this is.
+ rbranch = node.branch;
+
continue;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
