Revision: 73024
http://sourceforge.net/p/brlcad/code/73024
Author: starseeker
Date: 2019-05-08 11:15:49 +0000 (Wed, 08 May 2019)
Log Message:
-----------
More work on applying tags
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-08
11:01:17 UTC (rev 73023)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-08
11:15:49 UTC (rev 73024)
@@ -740,7 +740,7 @@
}
}
}
-
+
outfile.close();
}
@@ -1070,6 +1070,7 @@
int have_commit = 0;
int tag_after_commit = 0;
int branch_delete = 0;
+ int tag_only_commit = 0;
std::string ctag, cfrom;
if (rebuild_revs.find(rev.revision_number) != rebuild_revs.end()) {
@@ -1156,6 +1157,7 @@
toutfile << rev.commit_msg << "\n";
tag_ids[node.tag] = rev_to_gsha1[std::pair<std::string,long
int>(bbpath, rev.revision_number-1)];
toutfile.close();
+ tag_only_commit = 1;
continue;
}
@@ -1243,6 +1245,10 @@
}
bloboutfile.close();
+ if (tag_only_commit) {
+ remove(efi_file.c_str());
+ }
+
if (git_changes) {
if (have_commit) {
std::cout << "Error - more than one commit generated for revision "
<< rev.revision_number << "\n";
@@ -1255,7 +1261,7 @@
standard_commit(rev, rbranch, 0);
}
} else {
- if (!branch_delete) {
+ if (!branch_delete && !tag_only_commit) {
// If nothing else, make an empty commit
std::string cfi_file = std::to_string(rev.revision_number) +
std::string("-commit.fi");
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
