Revision: 73167
http://sourceforge.net/p/brlcad/code/73167
Author: starseeker
Date: 2019-05-24 02:03:45 +0000 (Fri, 24 May 2019)
Log Message:
-----------
More branch delete mapping logic
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-05-24
02:00:36 UTC (rev 73166)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-05-24
02:03:45 UTC (rev 73167)
@@ -54,17 +54,22 @@
starting_rev = get_starting_rev();
if (starting_rev == 29886) {
- std::string git_sync_1 = std::string("cd cvs_git && cat
../custom/r29886_cvs_svn_trunk_sync.fi | git fast-import && cd ..");
+ std::string git_sync_1 = std::string("cd cvs_git && cat
../custom/r29886_cvs_svn_trunk_sync.fi | git fast-import && cd ..");
/* Apply sync fast imports */
- if (std::system(git_sync_1.c_str())) {
- std::cerr << "Initial trunk sync failed!\n";
- exit(1);
- }
- std::string git_sync_2 = std::string("cd cvs_git && cat
../custom/r29886_cvs_svn_rel-5-1-branch_sync.fi | git fast-import && cd ..");
- if (std::system(git_sync_2.c_str())) {
- std::cerr << "Initial rel-5-1-branch sync failed!\n";
- exit(1);
- }
+ if (std::system(git_sync_1.c_str())) {
+ std::cerr << "Initial trunk sync failed!\n";
+ exit(1);
+ }
+ std::string git_sync_2 = std::string("cd cvs_git && cat
../custom/r29886_cvs_svn_rel-5-1-branch_sync.fi | git fast-import && cd ..");
+ if (std::system(git_sync_2.c_str())) {
+ std::cerr << "Initial rel-5-1-branch sync failed!\n";
+ exit(1);
+ }
+ std::string git_sync_3 = std::string("cd cvs_git && cat
../custom/r29886_cjohnson_mac_hack.fi | git fast-import && cd ..");
+ if (std::system(git_sync_3.c_str())) {
+ std::cerr << "Initial mac-hack sync failed!\n";
+ exit(1);
+ }
}
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-24
02:00:36 UTC (rev 73166)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-24
02:03:45 UTC (rev 73167)
@@ -643,9 +643,6 @@
int
write_gitignore_blob(std::ofstream &outfile, long int rev)
{
- if (rev == 29895) {
- std::cout << "got something\n";
- }
struct stat sbuffer;
std::string gi_file = std::string("gitignore/") + std::to_string(rev) +
std::string(".gitignore");
if (stat(gi_file.c_str(), &sbuffer)) {
@@ -1097,6 +1094,23 @@
if (rbranch == std::string("zlib")) {
wbranch = std::string("zlib_1_0_4");
}
+ if (rbranch == std::string("unlabeled-1.1.1")) return;
+ if (rbranch == std::string("unlabeled-1.2.1")) return;
+ if (rbranch == std::string("unlabeled-11.1.1")) return;
+ if (rbranch == std::string("unlabeled-2.12.1")) return;
+ if (rbranch == std::string("unlabeled-2.6.1")) return;
+ if (rbranch == std::string("unlabeled-9.1.1")) return;
+ if (rbranch == std::string("unlabeled-9.10.1")) return;
+ if (rbranch == std::string("unlabeled-9.12.1")) return;
+ if (rbranch == std::string("unlabeled-9.2.1")) return;
+ if (rbranch == std::string("unlabeled-9.3.1")) return;
+ if (rbranch == std::string("unlabeled-9.9.1")) return;
+ if (rbranch == std::string("unlabeled-1.1.2")) {
+ wbranch = std::string("master-UNNAMED-BRANCH");
+ }
+ if (rbranch == std::string("unlabeled-9.7.1")) {
+ wbranch = std::string("cjohnson-mac-hack");
+ }
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);
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
