Revision: 73046
http://sourceforge.net/p/brlcad/code/73046
Author: starseeker
Date: 2019-05-12 11:49:13 +0000 (Sun, 12 May 2019)
Log Message:
-----------
Work harder to get the branch name up front
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-12
03:11:19 UTC (rev 73045)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-12
11:49:13 UTC (rev 73046)
@@ -1037,8 +1037,22 @@
}
}
}
- std::string rbranch = rev.nodes[0].branch;
+ std::string rbranch = std::string("");
+ for (size_t n = 0; n != rev.nodes.size(); n++) {
+ struct svn_node &node = rev.nodes[n];
+ if (rbranch.length()) break;
+ rbranch = rev.nodes[0].branch;
+ }
+ if (!rbranch.length()) {
+ // If we don't have a branch, may be editing a tag. (See, for example,
r34555)
+ for (size_t n = 0; n != rev.nodes.size(); n++) {
+ struct svn_node &node = rev.nodes[n];
+ if (rbranch.length()) break;
+ rbranch = rev.nodes[0].tag;
+ }
+ }
+
// There are a variety of "skip this" cases - handle them
if (rev.revision_number == 30760) {
std::cout << "Skipping r30760 - premature tagging of rel-7-12-2. Will
be tagged by 30792\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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
