Revision: 73183
          http://sourceforge.net/p/brlcad/code/73183
Author:   starseeker
Date:     2019-05-25 19:37:31 +0000 (Sat, 25 May 2019)
Log Message:
-----------
R requires the path be current in the tree - try a D followed by an M for the 
renaming operation.

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 
14:36:49 UTC (rev 73182)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx    2019-05-25 
19:37:31 UTC (rev 73183)
@@ -803,7 +803,14 @@
            node_path_split(node.copyfrom_path, mproject, cbranch, ctag, 
mlocal_path, &is_tag);
            if (mlocal_path != node.local_path) {
                std::cout << "(r" << rev.revision_number << ") - renaming " << 
mlocal_path << " to " << node.local_path << "\n";
-               outfile << "R " << mlocal_path << " " << node.local_path << 
"\n";
+               outfile << "D " << mlocal_path << "\n";
+               outfile << "M ";
+               if (node.exec_path) {
+                   outfile << "100755 ";
+               } else {
+                   outfile << "100644 ";
+               }
+               outfile << svn_sha1_to_git_sha1[node.text_copy_source_sha1] << 
" " << node.local_path << "\n";
            }
        }
     }

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

Reply via email to