Revision: 78291
          http://sourceforge.net/p/brlcad/code/78291
Author:   starseeker
Date:     2021-02-20 02:29:43 +0000 (Sat, 20 Feb 2021)
Log Message:
-----------
Don't trust any git output for the CVS era - only assign a branch if we have 
SVN info.

Modified Paths:
--------------
    brlcad/trunk/misc/repowork/repowork.cpp

Modified: brlcad/trunk/misc/repowork/repowork.cpp
===================================================================
--- brlcad/trunk/misc/repowork/repowork.cpp     2021-02-20 02:13:18 UTC (rev 
78290)
+++ brlcad/trunk/misc/repowork/repowork.cpp     2021-02-20 02:29:43 UTC (rev 
78291)
@@ -445,14 +445,11 @@
                }
            }
 
-           if (revnum == 19673) {
-               std::cout << "revnum: " << revnum << "\n";
-           }
-           if (cmatch && revnum > 0 && rev_bset[revnum].size()) {
-               std::regex cvsbranchline("^cvs:branch:.*");
+           if (cmatch) {
+               std::regex cvsbranchline("^cvs:branch:.*");
                bool sbmatch = std::regex_match(cline, cvsbranchline);
                if (sbmatch) {
-                   if (!wcvsbranch) {
+                   if (revnum > 0 && rev_bset[revnum].size() && !wcvsbranch) {
                        std::set<std::string>::iterator s_it;
                        for (s_it = rev_bset[revnum].begin(); s_it != 
rev_bset[revnum].end(); s_it++) {
                            std::string nbranchline = 
std::string("cvs:branch:") + *s_it;

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

Reply via email to