Revision: 73188
http://sourceforge.net/p/brlcad/code/73188
Author: starseeker
Date: 2019-05-26 19:35:32 +0000 (Sun, 26 May 2019)
Log Message:
-----------
Only do move+edit commits on the files that are both moved and edited - if a
file in the commit is just moved, let the regular commit handle it.
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-26
16:37:32 UTC (rev 73187)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-26
19:35:32 UTC (rev 73188)
@@ -773,7 +773,7 @@
int have_real_rename = 0;
for (size_t n = 0; n != rev.nodes.size(); n++) {
struct svn_node &node = rev.nodes[n];
- if (node.copyfrom_path.length() > 0) {
+ if (node.move_edit && node.copyfrom_path.length() > 0) {
int is_tag;
std::string mproject, cbranch, mlocal_path, ctag;
node_path_split(node.copyfrom_path, mproject, cbranch, ctag,
mlocal_path, &is_tag);
@@ -797,6 +797,7 @@
struct svn_node &node = rev.nodes[n];
/* Don't add directory nodes themselves - git works on files */
if (node.kind == ndir) continue;
+ if (!node.move_edit) continue;
if (node.copyfrom_path.length() > 0) {
int is_tag;
std::string mproject, cbranch, mlocal_path, ctag;
@@ -1401,6 +1402,7 @@
remove(efi_file.c_str());
}
+ int have_mvonly = 0;
if (git_changes) {
if (have_commit) {
std::cout << "Error - more than one commit generated for revision "
<< rev.revision_number << "\n";
@@ -1407,7 +1409,7 @@
}
if (rev.move_edit) {
- int have_mvonly = move_only_commit(rev, rbranch);
+ have_mvonly = move_only_commit(rev, rbranch);
standard_commit(rev, rbranch, have_mvonly);
} else {
standard_commit(rev, rbranch, 0);
@@ -1430,6 +1432,7 @@
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
