Revision: 76565
http://sourceforge.net/p/brlcad/code/76565
Author: starseeker
Date: 2020-07-29 02:33:11 +0000 (Wed, 29 Jul 2020)
Log Message:
-----------
Make sure cvs lines are also separated by a new line from commit msg
Modified Paths:
--------------
brlcad/trunk/misc/repowork/commit.cpp
Modified: brlcad/trunk/misc/repowork/commit.cpp
===================================================================
--- brlcad/trunk/misc/repowork/commit.cpp 2020-07-29 00:48:02 UTC (rev
76564)
+++ brlcad/trunk/misc/repowork/commit.cpp 2020-07-29 02:33:11 UTC (rev
76565)
@@ -494,8 +494,13 @@
if (c->s->sha12key.find(c->id.sha1) != c->s->sha12key.end()) {
std::string cvsmsg = nmsg;
std::string key = c->s->sha12key[c->id.sha1];
+ int have_ret = (c->svn_id.length()) ? 1 : 0;
if (c->s->key2cvsbranch.find(key) != c->s->key2cvsbranch.end()) {
//std::cout << "Found branch: " << c->s->key2cvsbranch[key] << "\n";
+ if (!have_ret) {
+ cvsmsg.append("\n");
+ have_ret = 1;
+ }
std::string cb = c->s->key2cvsbranch[key];
cvsmsg.append("cvs:branch:");
if (cb == std::string("master")) {
@@ -507,6 +512,10 @@
}
if (c->s->key2cvsauthor.find(key) != c->s->key2cvsauthor.end()) {
//std::cout << "Found author: " << c->s->key2cvsauthor[key] << "\n";
+ if (!have_ret) {
+ cvsmsg.append("\n");
+ have_ret = 1;
+ }
std::string svnname = std::string("svn:account:") +
c->s->key2cvsauthor[key];
std::string cvsaccount = std::string("cvs:account:") +
c->s->key2cvsauthor[key];
size_t index = cvsmsg.find(svnname);
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
