Revision: 73143
http://sourceforge.net/p/brlcad/code/73143
Author: starseeker
Date: 2019-05-23 02:20:41 +0000 (Thu, 23 May 2019)
Log Message:
-----------
branch_delete doesn't always mean we don't have a commit to apply...
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-23
02:07:14 UTC (rev 73142)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-23
02:20:41 UTC (rev 73143)
@@ -1171,6 +1171,7 @@
int git_changes = 0;
int have_commit = 0;
int tag_after_commit = 0;
+ int branch_add = 0;
int branch_delete = 0;
int tag_only_commit = 0;
std::string ctag, cfrom;
@@ -1313,6 +1314,8 @@
// Make sure rbranch knows what branch this is.
rbranch = node.branch;
+ branch_add = 1;
+
continue;
}
@@ -1382,7 +1385,7 @@
}
}
- if (!branch_delete) {
+ if (branch_add || git_changes || tag_only_commit) {
apply_commit(rev, rbranch, 0);
}
}
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
