Revision: 73181
http://sourceforge.net/p/brlcad/code/73181
Author: starseeker
Date: 2019-05-25 12:46:40 +0000 (Sat, 25 May 2019)
Log Message:
-----------
More work on the early branch commits.
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-25
00:53:20 UTC (rev 73180)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-25
12:46:40 UTC (rev 73181)
@@ -1112,6 +1112,9 @@
if (rbranch == std::string("unlabeled-9.7.1")) {
wbranch = std::string("cjohnson-mac-hack");
}
+ if (rbranch == std::string("unlabeled-2.5.1")) {
+ wbranch = std::string("master-UNNAMED-BRANCH");
+ }
std::string cfi_file = std::to_string(rev.revision_number) +
std::string("-bdelete.fi");
std::ofstream coutfile(cfi_file, std::ios::out | std::ios::binary);
@@ -1168,18 +1171,11 @@
}
}
- // 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";
- return;
- }
-
if (rev.revision_number == 36472) {
std::cout << "Skipping r36472 - branch rename, handled by mapping the
original name in the original commit (dmtogl-branch) to the desired branch name
(dmtogl)\n";
- return;
+ exit(1);
}
-
if (rev_num == 36053) {
all_git_branches.push_back(std::string("rel8"));
}
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
