[brlcad-commits] SF.net SVN: brlcad:[78306] brlcad/trunk/misc/repoconv/ branch_corrections.txt

2021-02-22 Thread starseeker--- via brlcad-commits
Revision: 78306
  http://sourceforge.net/p/brlcad/code/78306
Author:   starseeker
Date: 2021-02-22 20:07:17 + (Mon, 22 Feb 2021)
Log Message:
---
set branch to trunk for r5208

Modified Paths:
--
brlcad/trunk/misc/repoconv/branch_corrections.txt

Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt
===
--- brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 18:38:45 UTC 
(rev 78305)
+++ brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 20:07:17 UTC 
(rev 78306)
@@ -241,3 +241,5 @@
 4e708577f63300e8aaa93eaaf1129da8b0a41c62:dmtogl-branch
 c0737a9252506872ce5ce6cd14207f7c375741da:dmtogl-branch
 
+885ed4c94ec0131f2cba48ffcbb3d0e03e4ecefd:trunk
+

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


[brlcad-commits] SF.net SVN: brlcad:[78305] brlcad/trunk/misc/repoconv/ branch_corrections.txt

2021-02-22 Thread starseeker--- via brlcad-commits
Revision: 78305
  http://sourceforge.net/p/brlcad/code/78305
Author:   starseeker
Date: 2021-02-22 18:38:45 + (Mon, 22 Feb 2021)
Log Message:
---
Make sure these commits are dmtogl-branch

Modified Paths:
--
brlcad/trunk/misc/repoconv/branch_corrections.txt

Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt
===
--- brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 14:31:58 UTC 
(rev 78304)
+++ brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 18:38:45 UTC 
(rev 78305)
@@ -234,3 +234,10 @@
 
 4aac0a9a29752528a36e4882da812857da5e1c6e:rel-5-1-patches
 eb4b12d2baecffdc33a56ba89b29d611395b8f3d:trunk
+
+8c18fd5b69faae7bd2a044483b221cbdd44c0423:dmtogl-branch
+b7d068814c202e53677946dc219b4ffd654362ac:dmtogl-branch
+eade42f1b43b8dc322129653eb9899f982f5e2bd:dmtogl-branch
+4e708577f63300e8aaa93eaaf1129da8b0a41c62:dmtogl-branch
+c0737a9252506872ce5ce6cd14207f7c375741da:dmtogl-branch
+

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


[brlcad-commits] SF.net SVN: brlcad:[78304] brlcad/trunk/misc/repoconv/ branch_corrections.txt

2021-02-22 Thread starseeker--- via brlcad-commits
Revision: 78304
  http://sourceforge.net/p/brlcad/code/78304
Author:   starseeker
Date: 2021-02-22 14:31:58 + (Mon, 22 Feb 2021)
Log Message:
---
Whoops, don't use semicolons here.

Modified Paths:
--
brlcad/trunk/misc/repoconv/branch_corrections.txt

Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt
===
--- brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 14:29:43 UTC 
(rev 78303)
+++ brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 14:31:58 UTC 
(rev 78304)
@@ -232,5 +232,5 @@
 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.7.1
 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.9.1
 
-4aac0a9a29752528a36e4882da812857da5e1c6e;rel-5-1-patches
-eb4b12d2baecffdc33a56ba89b29d611395b8f3d;trunk
+4aac0a9a29752528a36e4882da812857da5e1c6e:rel-5-1-patches
+eb4b12d2baecffdc33a56ba89b29d611395b8f3d:trunk

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


[brlcad-commits] SF.net SVN: brlcad:[78303] brlcad/trunk/misc/repowork/repowork.cpp

2021-02-22 Thread starseeker--- via brlcad-commits
Revision: 78303
  http://sourceforge.net/p/brlcad/code/78303
Author:   starseeker
Date: 2021-02-22 14:29:43 + (Mon, 22 Feb 2021)
Log Message:
---
Need to skip label if the rev is < 0

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

Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 14:21:23 UTC (rev 
78302)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 14:29:43 UTC (rev 
78303)
@@ -198,11 +198,13 @@
long nrev =  rmap[s->commits[i].id.sha1];
s->commits[i].svn_id = nrev;
 
-   std::cout << "Assigning new SVN rev " << nrev << " to " << 
s->commits[i].id.sha1 << "\n";
+   if (nrev > 0) {
+   std::cout << "Assigning new SVN rev " << nrev << " to " << 
s->commits[i].id.sha1 << "\n";
 
-   // Note:  this isn't guaranteed to be unique...  setting it mostly for
-   // the cases where it is.
-   s->rev_to_sha1[s->commits[i].svn_id] = s->commits[i].id.sha1;
+   // Note:  this isn't guaranteed to be unique...  setting it mostly 
for
+   // the cases where it is.
+   s->rev_to_sha1[s->commits[i].svn_id] = s->commits[i].id.sha1;
+   }
 
// Update the message
std::stringstream ss(s->commits[i].commit_msg);
@@ -242,9 +244,11 @@
// the existing one, inserting a new line before the
// current non-revision svn line, or skipping if the
// nrev value is -1.
-   std::string nrevline = std::string("svn:revision:") + 
std::to_string(nrev);
-   nmsg.append(nrevline);
-   nmsg.append("\n");
+   if (nrev > 0) {
+   std::string nrevline = std::string("svn:revision:") + 
std::to_string(nrev);
+   nmsg.append(nrevline);
+   nmsg.append("\n");
+   }
// Any further svn:revision lines will be skipped - for
// now at least, one to a commit.
srev = true;

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


[brlcad-commits] SF.net SVN: brlcad:[78302] brlcad/trunk/misc/repoconv

2021-02-22 Thread starseeker--- via brlcad-commits
Revision: 78302
  http://sourceforge.net/p/brlcad/code/78302
Author:   starseeker
Date: 2021-02-22 14:21:23 + (Mon, 22 Feb 2021)
Log Message:
---
Corrections for 19755

Modified Paths:
--
brlcad/trunk/misc/repoconv/branch_corrections.txt
brlcad/trunk/misc/repoconv/svn_rev_updates.txt

Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt
===
--- brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 04:00:21 UTC 
(rev 78301)
+++ brlcad/trunk/misc/repoconv/branch_corrections.txt   2021-02-22 14:21:23 UTC 
(rev 78302)
@@ -232,4 +232,5 @@
 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.7.1
 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.9.1
 
-
+4aac0a9a29752528a36e4882da812857da5e1c6e;rel-5-1-patches
+eb4b12d2baecffdc33a56ba89b29d611395b8f3d;trunk

Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt
===
--- brlcad/trunk/misc/repoconv/svn_rev_updates.txt  2021-02-22 04:00:21 UTC 
(rev 78301)
+++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt  2021-02-22 14:21:23 UTC 
(rev 78302)
@@ -1,6 +1,7 @@
 771b3183f9e315f6e1451a1e3462e6f84724a9cd;735
+
 eb4b12d2baecffdc33a56ba89b29d611395b8f3d;19755
-
+4aac0a9a29752528a36e4882da812857da5e1c6e;19755
 2788b39fe6de7e5fbfcdc30b9c38e2a15b69bf63;21635
 050bedc3065ed5b051958343bae465c2823ad29e;21635
 0d7ec74a6b6056eafeac1cec2d8f749ac5a2a58f;22217

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