Revision: 72458
http://sourceforge.net/p/brlcad/code/72458
Author: starseeker
Date: 2019-02-18 02:52:12 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
Try revision marks as merge ids
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-02-18
01:11:33 UTC (rev 72457)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-02-18
02:52:12 UTC (rev 72458)
@@ -61,6 +61,7 @@
int tag_edit; // Has revision level implications - set if any child nodes
are set
int merge;
std::string merged_from;
+ long int merged_rev;
};
@@ -765,6 +766,7 @@
if (crev > maxrev && node.branch.compare(cbranch)) {
rev.merged_from = cbranch;
maxrev = crev;
+ rev.merged_rev = maxrev;
}
}
}
@@ -1003,6 +1005,12 @@
outfile << "from " << branch_head_id(rbranch,
rev.revision_number) << "\n";
branch_head_ids[rbranch] = std::to_string(rev.revision_number);
+ if (rev.merged_from.length()) {
+ std::cout << "Revision " << rev.revision_number << " merged
from: " << rev.merged_from << "(" << rev.merged_rev << "), id " <<
branch_head_id(rev.merged_from, rev.merged_rev) << "\n";
+ std::cout << "Revision " << rev.revision_number << "
from: " << rbranch << "\n";
+ outfile << "merge :" << rev.merged_rev << "\n";
+ }
+
for (size_t n = 0; n != rev.nodes.size(); n++) {
struct svn_node &node = rev.nodes[n];
/* Don't add directory nodes themselves - git works on
files */
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
