[brlcad-commits] SF.net SVN: brlcad:[78389] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78389 http://sourceforge.net/p/brlcad/code/78389 Author: starseeker Date: 2021-03-06 00:57:14 + (Sat, 06 Mar 2021) Log Message: --- ec2350e is 2103, not 2185 Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-06 00:39:55 UTC (rev 78388) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-06 00:57:14 UTC (rev 78389) @@ -525,7 +525,6 @@ 607c2b5e3a6a5270778c40266ab7ea3d7e49affc;2185 6ae14458f214924da4a66e950543b3f5d03b1871;2185 908505f8729b4ff7668d91680abc5a70f9c051e1;2185 -ec2350e47ab0a7a6a2e4f798aaf3a348775077ef;2185 5761aea5f6d2a0477b608834ed51df7a275748b7;2201 97b9bfa583371d50e0b01ed5baf2b62147702ac5;2201 c7fd7f66783095cd68afb1cd5883fd50114a0a9e;2201 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78388] brlcad/trunk/misc/repoconv
Revision: 78388 http://sourceforge.net/p/brlcad/code/78388 Author: starseeker Date: 2021-03-06 00:39:55 + (Sat, 06 Mar 2021) Log Message: --- Use replace mechanism to add multiple SVN commit labels to some git commits. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Added Paths: --- brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/76e74e9e9ce955bf6602171e67cbcd9539bfbec9 brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/a098425430db227021617976961e6b51ce5569cb brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/a7c85f280677d70b8eef9aadf79302736ed26ffc brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/c7da20384024574fddc07c59dcdfcc2879560e31 brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/e6417be98f27d570d863744f566f5aaf738abbe6 brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/eb0179c08aefd8ea90697c42eba31244e4904eed brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/f5a1b0037fec2927cba073d118db24cdbd681975 brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/f9fd3ad956d23e854df73294083cb37ef3c2f341 brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/fc9e5a26cba18a926c644a4e2bb4b321855f2a88 Property Changed: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2 Added: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f === (Binary files differ) Index: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f 2021-03-05 22:43:33 UTC (rev 78387) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f 2021-03-06 00:39:55 UTC (rev 78388) Property changes on: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/11077485329842c81213eab68006fe5d58b5925f ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db === (Binary files differ) Index: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db 2021-03-05 22:43:33 UTC (rev 78387) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db 2021-03-06 00:39:55 UTC (rev 78388) Property changes on: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/67c46ada661fdab789632885c34bf77a277962db ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2 === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-03-05 22:43:33 UTC (rev 78387) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-03-06 00:39:55 UTC (rev 78388) Property changes on: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2 ___ Modified: svn:mime-type ## -1 +1 ## -text/plain \ No newline at end of property +application/octet-stream \ No newline at end of property Added: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/76e74e9e9ce955bf6602171e67cbcd9539bfbec9 === (Binary files differ) Index: brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/76e74e9e9ce955bf6602171e67cbcd9539bfbec9 === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/76e74e9e9ce955bf6602171e67cbcd9539bfbec9 2021-03-05 22:43:33 UTC (rev 78387) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/76e74e9e9ce955bf6602171e67cbcd9539bfbec9 2021-03-06 00:39:55 UTC (rev 78388) Property changes on:
[brlcad-commits] SF.net SVN: brlcad:[78383] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78383 http://sourceforge.net/p/brlcad/code/78383 Author: starseeker Date: 2021-03-05 15:38:54 + (Fri, 05 Mar 2021) Log Message: --- This portion of the diff on vextern.h mapps to part of SVN r829 Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-05 14:49:59 UTC (rev 78382) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-05 15:38:54 UTC (rev 78383) @@ -157,8 +157,8 @@ d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;824 bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;825 1c733d8abdc109719c5371801a2db9fc11b103bf;826 -688ec2591a6b6d2ad986a8b4472c2ff18716a278;827 8f931991a4c11cc213983fb6c357175cf61b51fc;827 +688ec2591a6b6d2ad986a8b4472c2ff18716a278;829 13e741a53c532b17b3ee3c6db9442611d1b88f10;830 527c4407c7ab507cdfdaca0e36d3d1e88dc14c2c;831 22cd753068d378c64b8289c63015caa9375c89a3;832 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78382] brlcad/trunk/misc/repoconv/remove_commits.txt
Revision: 78382 http://sourceforge.net/p/brlcad/code/78382 Author: starseeker Date: 2021-03-05 14:49:59 + (Fri, 05 Mar 2021) Log Message: --- Remove r62027 and r62028 - incorrect creation and immediate deletion of framebuffer-experiment branch in SVN. In git conversion these are immediately followed by r62029 on the same branch, which ends up being a duplicate of r62027. Modified Paths: -- brlcad/trunk/misc/repoconv/remove_commits.txt Modified: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-05 14:27:19 UTC (rev 78381) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-05 14:49:59 UTC (rev 78382) @@ -71,6 +71,11 @@ # Spurious trunk branch empty commit associated with branch removal 797d0138514136e2e95b0dfa1cc7d2e774fef2ab +# Branch creation and immediate deletion (wrong location, no content) +03fe6a9fecc8a9ee1e69ad26dcc2b084ebd3066e +ad46e8627acf59ec3cbae0d65f0a687f54710f8b + + # The following are all empty commits of the form "file N was initially added on branch M" ea9c83e50fa49cdad8dc0bb114f618abb6f69f0c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78381] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78381 http://sourceforge.net/p/brlcad/code/78381 Author: starseeker Date: 2021-03-05 14:27:19 + (Fri, 05 Mar 2021) Log Message: --- Sean spotted swapped SVN revision labels based on diffs (original assignment was probably timestamp based.) Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-05 07:35:08 UTC (rev 78380) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-05 14:27:19 UTC (rev 78381) @@ -890,6 +890,8 @@ e79b4e9d9795946f9e5cdce4ad3de000df404550;9005 f1069e250eaf970a599959b95868e10d6728263c;9009 d28d7275f34c7f518f04c2d4e8c16a47efae0d80;9012 +68b56645d7a689a3af445bb5dfef16c78a4a4270;9015 +24c9f6ebb84eba2bb53211c3012b7dfb68672a2b;9016 71623b48fa3e17d320eb8e0ed27d32d0b52fb179;9019 ed8382b5a69ce2700a2433b84f94cc1c17d341fd;9019 891311f6514cb57f0cb031ce64c12e980f80bcd3;9033 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78379] brlcad/trunk/src/other/tk/CMakeLists.txt
Revision: 78379
http://sourceforge.net/p/brlcad/code/78379
Author: starseeker
Date: 2021-03-05 03:35:36 + (Fri, 05 Mar 2021)
Log Message:
---
User report that setting this flag caused a compilation failure, with RC
complaining about 'invalid usage'. Removing the definition produced a
successful build.
Modified Paths:
--
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===
--- brlcad/trunk/src/other/tk/CMakeLists.txt2021-03-04 17:01:14 UTC (rev
78378)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt2021-03-05 03:35:36 UTC (rev
78379)
@@ -670,7 +670,7 @@
if (MSVC)
set(TK_SRCS ${TK_SRCS} win/rc/tk.rc)
- set(CMAKE_RC_FLAGS /i${CMAKE_CURRENT_BINARY_DIR})
+ #set(CMAKE_RC_FLAGS /i${CMAKE_CURRENT_BINARY_DIR})
endif (MSVC)
if (X11_INCLUDE_DIR)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78378] brlcad/trunk/CMakeLists.txt
Revision: 78378
http://sourceforge.net/p/brlcad/code/78378
Author: starseeker
Date: 2021-03-04 17:01:14 + (Thu, 04 Mar 2021)
Log Message:
---
Write out the CMake version in use to the configure history - we often want to
know this.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2021-03-04 16:32:48 UTC (rev 78377)
+++ brlcad/trunk/CMakeLists.txt 2021-03-04 17:01:14 UTC (rev 78378)
@@ -143,6 +143,11 @@
set(BRLCAD_PRINT_MSGS 0)
endif(NOT EXISTS ${BRLCAD_CNT_FILE})
+# Now that we know whether or not we're supposed to, print the CMake verison
+if(BRLCAD_PRINT_MSGS)
+ message(STATUS "CMake version: ${CMAKE_VERSION}")
+endif(BRLCAD_PRINT_MSGS)
+
#-
# Define an option to use OBJECT libraries. If we are building with object
# libraries, we need position independent code.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78377] brlcad/trunk
Revision: 78377
http://sourceforge.net/p/brlcad/code/78377
Author: starseeker
Date: 2021-03-04 16:32:48 + (Thu, 04 Mar 2021)
Log Message:
---
Experiment with a 'gdal' type to force triggering of the gdal plugin.
Modified Paths:
--
brlcad/trunk/misc/mime_cad.types
brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
Modified: brlcad/trunk/misc/mime_cad.types
===
--- brlcad/trunk/misc/mime_cad.types2021-03-04 15:39:53 UTC (rev 78376)
+++ brlcad/trunk/misc/mime_cad.types2021-03-04 16:32:48 UTC (rev 78377)
@@ -41,3 +41,4 @@
model/vnd.gift cg comgeom
model/vnd.intaval tgf
model/vnd.rhino3dm
+model/vnd.gdal gdal dem dted tif tiff
Modified: brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
===
--- brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2021-03-04 15:39:53 UTC
(rev 78376)
+++ brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2021-03-04 16:32:48 UTC
(rev 78377)
@@ -430,7 +430,7 @@
extern "C"
{
struct gcv_filter gcv_conv_gdal_read =
-{"GDAL Reader", GCV_FILTER_READ, BU_MIME_MODEL_AUTO, gdal_can_read,
gdal_read_create_opts, gdal_read_free_opts, gdal_read};
+{"GDAL Reader", GCV_FILTER_READ, BU_MIME_MODEL_VND_GDAL, gdal_can_read,
gdal_read_create_opts, gdal_read_free_opts, gdal_read};
static const struct gcv_filter * const filters[] = {_conv_gdal_read,
NULL};
const struct gcv_plugin gcv_plugin_info_s = { filters };
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78376] brlcad/trunk/misc/repoconv
Revision: 78376
http://sourceforge.net/p/brlcad/code/78376
Author: starseeker
Date: 2021-03-04 15:39:53 + (Thu, 04 Mar 2021)
Log Message:
---
Automate the setup for the final post-process, since there are now a fair
number of setup steps.
Added Paths:
---
brlcad/trunk/misc/repoconv/process.sh
brlcad/trunk/misc/repoconv/repowork_new_commmits/add/
brlcad/trunk/misc/repoconv/repowork_new_commmits/add/VendorARL_del.fi
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
brlcad/trunk/misc/repoconv/repowork_new_commmits/splices/
brlcad/trunk/misc/repoconv/repowork_new_commmits/splices/r66607_trunk.fi
Removed Paths:
-
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi
brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi
Added: brlcad/trunk/misc/repoconv/process.sh
===
--- brlcad/trunk/misc/repoconv/process.sh (rev 0)
+++ brlcad/trunk/misc/repoconv/process.sh 2021-03-04 15:39:53 UTC (rev
78376)
@@ -0,0 +1,20 @@
+#!/bin/bash
+rm -rf git_repo test.fi
+rm -rf add replace splices
+mkdir add && cp ../../repoconv/repowork_new_commmits/add/* add/
+mkdir replace && cp ../../repoconv/repowork_new_commmits/replace/* replace/
+mkdir splices && cp ../../repoconv/repowork_new_commmits/splices/* splices/
+cp ../../repoconv/cvs_svn_branches.txt .
+cp ../../repoconv/svn_rev_updates.txt .
+cp ../../repoconv/branch_corrections.txt .
+cat ../../repoconv/remove_commits.txt | awk -F"#" '{print $1}' | awk '{gsub(/[
]+$/,""); print $0}' |awk NF > remove_commits.txt
+cat ../../repoconv/tag_commits.txt | grep \^commit|awk '{print $2}' > tag_sha1s
+./repowork --svn-revs svn_rev_updates.txt --svn-branches cvs_svn_branches.txt
--svn-branches-to-tags tag_sha1s --correct-branches branch_corrections.txt
--remove-commits remove_commits.txt --splice-commits --replace-commits
--add-commits conv12.fi test.fi
+mkdir git_repo && cd git_repo && git init
+cat ../test.fi |git fast-import
+git checkout main
+git gc --aggressive
+git reflog expire --expire-unreachable=now --all
+git gc --prune=now
+cd ..
+
Property changes on: brlcad/trunk/misc/repoconv/process.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
Deleted:
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
===
---
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:27:20 UTC (rev 78375)
+++
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:39:53 UTC (rev 78376)
@@ -1,12 +0,0 @@
-commit refs/heads/cjohnson-mac-hack
-author Christopher Johnson 625826935 +
-committer Phillip Dykstra 625826935 +
-data 88
-Chris Johnson's Mac Hack
-
-svn:revision:3698
-cvs:branch:unlabeled-9.7.1
-cvs:account:phil
-from df207709f5474f88155bf37d91a9dd855ad02f53
-deleteall
-M 100644 8684ce993e973b87c057cb7bad43a84c71ffe704 libfb/if_X.c
Deleted: brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi
===
(Binary files differ)
Copied: brlcad/trunk/misc/repoconv/repowork_new_commmits/add/VendorARL_del.fi
(from rev 78375,
brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi)
===
(Binary files differ)
Deleted: brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi
===
(Binary files differ)
Copied:
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
(from rev 78375,
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2)
===
---
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
(rev 0)
+++
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:39:53 UTC (rev 78376)
@@ -0,0 +1,12 @@
+commit refs/heads/cjohnson-mac-hack
+author Christopher Johnson 625826935 +
+committer Phillip Dykstra 625826935 +
+data 88
+Chris Johnson's Mac Hack
+
+svn:revision:3698
+cvs:branch:unlabeled-9.7.1
+cvs:account:phil
+from
[brlcad-commits] SF.net SVN: brlcad:[78375] brlcad/trunk/misc/repoconv/remove_commits.txt
Revision: 78375
http://sourceforge.net/p/brlcad/code/78375
Author: starseeker
Date: 2021-03-04 15:27:20 + (Thu, 04 Mar 2021)
Log Message:
---
Stash a scripting line that will process the commented remove_commits list to
prepare an input.
Modified Paths:
--
brlcad/trunk/misc/repoconv/remove_commits.txt
Modified: brlcad/trunk/misc/repoconv/remove_commits.txt
===
--- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 14:42:37 UTC
(rev 78374)
+++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 15:27:20 UTC
(rev 78375)
@@ -1,3 +1,5 @@
+# To prepare for processing:
+# cat remove_commits.txt | awk -F"#" '{print $1}' | awk '{gsub(/[ ]+$/,"");
print $0}' |awk NF
52036a8b4569b8ffe90e2e8fb0b43f5ed36ba040 # SVN property change
908505f8729b4ff7668d91680abc5a70f9c051e1 # No-op among similar commit msg
cvs-fast-export commits
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78374] brlcad/trunk/misc/repoconv/remove_commits.txt
Revision: 78374 http://sourceforge.net/p/brlcad/code/78374 Author: starseeker Date: 2021-03-04 14:42:37 + (Thu, 04 Mar 2021) Log Message: --- Working from list generated by Sean, identify a few Git commits that can be removed. Modified Paths: -- brlcad/trunk/misc/repoconv/remove_commits.txt Modified: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 02:32:32 UTC (rev 78373) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 14:42:37 UTC (rev 78374) @@ -57,7 +57,18 @@ 720f9b9b75588e35d3cce0f9f5b802abea2259ab d748c2ea214b699008563e18f5a7105de39faba9 +# Collapsed branches in Git conversion resulting in multiple semi-duplicate empty commits on single branch +68aeb784b3ee698c854878c190eb4b229b88e1fe +c0737a9252506872ce5ce6cd14207f7c375741da +# It looks like this was read as a branch delete and re-creation, so it got a branch delete +# commit. That's not how it works or displays in Git, which is actually cleaner - remove +# the empty branch delete commit +f828d1c0b1f6e68879a1bdecb2c58d1dc9a9207b + +# Spurious trunk branch empty commit associated with branch removal +797d0138514136e2e95b0dfa1cc7d2e774fef2ab + # The following are all empty commits of the form "file N was initially added on branch M" ea9c83e50fa49cdad8dc0bb114f618abb6f69f0c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78373] brlcad/trunk/misc/CMakeLists.txt
Revision: 78373 http://sourceforge.net/p/brlcad/code/78373 Author: starseeker Date: 2021-03-04 02:32:32 + (Thu, 04 Mar 2021) Log Message: --- remove nonexistant file from list Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-03-04 00:54:49 UTC (rev 78372) +++ brlcad/trunk/misc/CMakeLists.txt2021-03-04 02:32:32 UTC (rev 78373) @@ -105,7 +105,6 @@ profont/readme.txt uncpowerplant2g.sh repoconv/29886-note-template.fi - repoconv/r66607_trunk.fi repoconv/CONVERT.sh repoconv/NOTES repoconv/RESUME.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78372] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78372 http://sourceforge.net/p/brlcad/code/78372 Author: starseeker Date: 2021-03-04 00:54:49 + (Thu, 04 Mar 2021) Log Message: --- Revert - those assignment changes didn't fix any checkout diffs. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 22:03:57 UTC (rev 78371) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-04 00:54:49 UTC (rev 78372) @@ -53,10 +53,10 @@ 65fe5dcf39e51bc8c02d4a33c5e6bdc1a310151d;493 b547003813352fbbbe2914adfa1d0f86ee118e07;493 b609d360699c67f028bcc088d9ac2bac22a6c898;493 -961cbc9a60999ef176301319892ccce0ebeb3850;525 -8d56b421e2f846e8b3dc7a5f989a3015458d45a3;525 -47dbef390d420864e0eb4c61bcb0b7d9db0d3201;526 +47dbef390d420864e0eb4c61bcb0b7d9db0d3201;527 73dc291ec459e37ce2c9aa2807c1d6065958a88d;527 +8d56b421e2f846e8b3dc7a5f989a3015458d45a3;527 +961cbc9a60999ef176301319892ccce0ebeb3850;527 5b9eb3d4f97689deca7cb1dcb3d2162aa41ff566;552 f22d53a5d76436d711e4dd76667f01886bcbafa8;552 0c028d023f06de676b5b1d968c1d8fb1bb106729;568 @@ -727,16 +727,16 @@ 0864f161fee4baff1f39c154c370dcb9db051819;4017 0fe95e56d65047d8505c9e86b5f3dcdfcba5d092;4017 bec6f12a0ff0d2a25e7aaf84ba55b267efeb050f;4077 -79873557412c5b003816ef35c6b4aeb0aad72baf;4321 +79873557412c5b003816ef35c6b4aeb0aad72baf;4323 554620ca9d355a412f8c7de2e312ac5165039dd2;4524 6510d5c52356b1a2a8069220e06857f4102689e6;4524 e5fa95d172ba7f4d329f76738dcd1babc1c663ab;4524 -0ecb586939e7cb921c3a78d5708d7bc5e8df13a8;4668 -de26c5f2e7931e087c624b5451610d40dd1fc7ec;4668 -59209a25026cc7ffdfd9bc5c9e20b05d536c8a59;4697 +0ecb586939e7cb921c3a78d5708d7bc5e8df13a8;4669 +de26c5f2e7931e087c624b5451610d40dd1fc7ec;4669 2545d8dba6823921ded4e44cec935a744cfb86e4;4698 +59209a25026cc7ffdfd9bc5c9e20b05d536c8a59;4698 3a9fe3ca74dd50c55b6102bc40eb1c5683044711;4702 -bd8189103872e05327480b3db8a8bcb122d4e502;4889 +bd8189103872e05327480b3db8a8bcb122d4e502;4890 ea67b6b0a11a9f6aa405af1a85c85a3204ed3cf7;4891 8ef313245ffbc74f554deadec598ff6dc6beb83e;4921 8f15ff80eb5e949c4b4eb1581843d35489560f38;4921 @@ -743,10 +743,10 @@ 3a7911d9f50e8aa847aacb85fa1e6da86229cf9b;4931 6157a0c33c5565aee6588d99bebb2e27be60333b;5074 8cfaf3363a0644a7904e4d3a09da7978e94630bb;5141 -eeb7cfaa353aca3259df37264807df8632a24e03;5141 -0f497f84e18587fb302d1d6e65100d0bc7bb259e;5191 +eeb7cfaa353aca3259df37264807df8632a24e03;5142 +0f497f84e18587fb302d1d6e65100d0bc7bb259e;5192 465f35fc9553bb74f03730d2f06f06469eafbf78;5197 -09a774da0ead526eab11dbc5319e1335268f45a6;5207 +09a774da0ead526eab11dbc5319e1335268f45a6;5208 e75443d252e4607c696c43e3da0caf641503d5a4;5208 fe3c685f1ea99964fc9d96ed81488d5642c870a8;5422 003b03f78fdcc5ad51267fe132798f42860de523;5446 @@ -773,7 +773,7 @@ 0191686b314fff22b845b2e50aa4f8399d5a38b2;5545 2133f4571bb06263c75a8385b08206ec022f5de3;5631 cdda2e9d63ab91d4c79f0a47480a5f0655db371f;5631 -d2dc6a43986c1a871b064abeb98fae8dfa32a8b4;5666 +d2dc6a43986c1a871b064abeb98fae8dfa32a8b4;5667 feaaf0a5e4e2560f85f19a16db713b0bcf6518fa;5734 ffceec8a7e4227042b531285d419b96b500e5ebf;5734 cdceaacbbe9b8fa7f88ce3bff1294a7e846d457b;5781 @@ -784,21 +784,21 @@ 1602f5592d7602cbcbe430887b29ad28d7d78fdb;5907 6a28f149285c443d7c5f2d4626de152a4b5a319f;5907 fcce07977613478754683cc8973080b5ccb168fe;5907 -7c6de173a980da19a62d4359c26857ed8b6f73d0;5919 +7c6de173a980da19a62d4359c26857ed8b6f73d0;5920 95e21e8c4d4ad682fb3b2dc6c98100386ac66d7a;5920 bdff1bc94373305929b1b6398d0d8f949e55e2a3;5920 4b144b962aab908af92bde958a2756825cbb4762;5979 ea4d6e07fef9433a337eca7cfb584d2929a4a13f;5979 -7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6344 +7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6345 837f243e290d6b4870e59c545a405c9fee71027e;6441 db7d89e8dea67d9a3dda6b2d33425185154f3b1d;6478 e847ab502326201f7e47fd50d81d227653737831;6478 49af06eed009659362295191f220321382f210ed;6486 fe4283b0f7ad47c2ebc8da2c4a47c52ac1c49f7d;6486 -2e715e80a73f27667f52fdac3c7dab24bfac33d9;6489 -1e12763a7116cee063635c3c357fda8e02e0b901;6626 -87240aae24f5b63e0e7b0677bba711a491a41c36;6626 +2e715e80a73f27667f52fdac3c7dab24bfac33d9;6490 +1e12763a7116cee063635c3c357fda8e02e0b901;6627 72828195c8e1c1cb5b54e0baa552c3176787e0b4;6627 +87240aae24f5b63e0e7b0677bba711a491a41c36;6627 f656ce7d35ef0797aac8cd8eba1fc19698ff9145;6627 1bef32e987cd79f689f63fc0e259f831ef158ea3;6632 2c248235f81d2d8985150c7d34393a21d3bf35c0;6649 @@ -832,16 +832,16 @@ 91abdbe7b16f5de49cb37eccb416bad9618ffba9;7066 a5ac5ea41f2c07950d97fe037f8d5303c6472d44;7066 df12af0b787d7ad1ccb72e1afd85a22ad71e26d3;7066 +48c16d3a341ccab510b171f1208f78c8ddb4756b;7132 +5d3cc78ee218b015d7b2d401e502093bce66;7132 6ab3940e98bba5c36fe05c995d578df7e423cf0d;7132 e5708dea0741dfa903f28fb5b2b1c61cb92ce66b;7132 -5d3cc78ee218b015d7b2d401e502093bce66;7132 ff982ee064bc63d06950301e5e50df4bc3bf5074;7132
[brlcad-commits] SF.net SVN: brlcad:[78371] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78371 http://sourceforge.net/p/brlcad/code/78371 Author: starseeker Date: 2021-03-03 22:03:57 + (Wed, 03 Mar 2021) Log Message: --- r270 has both header and mater.c Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 22:00:33 UTC (rev 78370) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 22:03:57 UTC (rev 78371) @@ -43,7 +43,7 @@ a6030788faffd9f28dd8a619a527217cb3631dd2;256 10891054d72e8a9c71ae0d409cf41ab73fdeebbb;259 cad8629fd4b7c7167f598b1f4713a284d2fd9c3b;259 -d7c39260349cf7e4aadaa0bb1aa14c779bc85d2e;269 +d7c39260349cf7e4aadaa0bb1aa14c779bc85d2e;270 7705f04f59b0a63da331ffe7430449332f972ab7;276 906457353e90844830124aa4a9f08225448b3dd0;290 9036ef90404e0b9dd5f141146f96b17f2d3fed46;305 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78370] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78370 http://sourceforge.net/p/brlcad/code/78370 Author: starseeker Date: 2021-03-03 22:00:33 + (Wed, 03 Mar 2021) Log Message: --- No, ged.h isn't part of r102. Checkout difference must be driven by other differences. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 21:38:18 UTC (rev 78369) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 22:00:33 UTC (rev 78370) @@ -37,7 +37,7 @@ de43b627fabc592beb6c8fc85edaddd2156f;91 fd8babe28f66e3a96b546c1317dd3e959fd9eb9d;91 fe2ed019e29e3bbae3a071a6d584a332d545b615;91 -ed8938c786dad64529057d6e48655ddfda569bd6;102 +ed8938c786dad64529057d6e48655ddfda569bd6;103 2d5d1f2bb03342b0d7cbb63741d9a149bd5bdd9a;131 0b8e58cf9bdf4fc4176a5d8529b9ed03b0f1e01b;139 a6030788faffd9f28dd8a619a527217cb3631dd2;256 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78369] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78369 http://sourceforge.net/p/brlcad/code/78369 Author: starseeker Date: 2021-03-03 21:38:18 + (Wed, 03 Mar 2021) Log Message: --- Whoops, lost the 18992 assignment from NOTES Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 21:21:37 UTC (rev 78368) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 21:38:18 UTC (rev 78369) @@ -1120,6 +1120,7 @@ 2fd21520030fc9ff527c102f396020d392a37540;18554 f9cce0d7c24c1b918f3295959f7b5670445cdc6e;18738 d0b693d0a17513533b3d9f13ac2b153a741aefae;18836 +67c46ada661fdab789632885c34bf77a277962db;18992 2c40428b7a1a989174df43b66fd00d9d960487bc;18999 aec4367dafd37a7b0657c4b27414caa21ac4c1be;19032 aee16dc8c5447d5d9e7518fc462e1f233986327b;19121 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78368] brlcad/trunk/misc/repoconv
Revision: 78368 http://sourceforge.net/p/brlcad/code/78368 Author: starseeker Date: 2021-03-03 21:21:37 + (Wed, 03 Mar 2021) Log Message: --- More assignment updates, make some notes on commits that don't match for one reason or another. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 17:24:14 UTC (rev 78367) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 21:21:37 UTC (rev 78368) @@ -861,8 +861,8 @@ 92ef2eac69653eff5565cff31dbc9212472786d8;8163 4151dec64c81b8254b3b2d06a02138791ee67eaa;8625 84f852f631de2f70dbe1240818e909eebccd3f20;8628 -504efa94e18a486e8ee3cf32d6e14d28165fd869;8815 -680ed5f55760a7c6768491af8a78d4046cec847d;8815 +680ed5f55760a7c6768491af8a78d4046cec847d;8812 +504efa94e18a486e8ee3cf32d6e14d28165fd869;8814 b8dd048a1705bd234e8f82e5883db89cdc6a5b76;8863 10a09bd1d95624b01122820d33ac7c66fdf192db;8864 69468c08373fdce99ca1a7cfe1a62afbed78c0b8;8866 @@ -874,20 +874,20 @@ 985504b6a131735cc4a246b83b89305b590afa03;8875 46e6213d4e91a7744c38a66674ad112cffc4aca6;8876 b497b720599b9e7274d8c786013753c73543eb6d;8877 -ffb390283f60a0d8a30373e756159dfcbab675d7;8894 -e5634e338604c901c762b025a936bfa9e7c9d1a0;8901 -8d19f2b59983b4ada13f9c9c4460c6d5f6a7c4f1;8903 -d2bfffa748e7789c3458c3ca731d4973cddefcc7;8903 -ae4c461cc9aa8cbe0278921a4e1852ee188e5499;8904 +ffb390283f60a0d8a30373e756159dfcbab675d7;8895 +e5634e338604c901c762b025a936bfa9e7c9d1a0;8900 +8d19f2b59983b4ada13f9c9c4460c6d5f6a7c4f1;8902 +d2bfffa748e7789c3458c3ca731d4973cddefcc7;8902 +ae4c461cc9aa8cbe0278921a4e1852ee188e5499;8903 e5c18b9770ef1222ed1ee4fdc02ae1d248c47e91;8904 -8a3491626463e09c7abb6758b349e331263ef24a;8922 -4f57197c1797cb838d951f4adf3e6b84d8e4e355;8953 -ad68afed926243c71b36b434c8eca0464e748375;8958 -cf928cd2e7ee3c5b0618146c373175c33cb8bf10;8974 -12c2f177c29ff29a9cac92d53c40fcf740acd186;9000 -be15da25a0e9bf8999d07ba412ed579720055ad1;9000 -b6a8a7aad1cd3b36429470e64eb389b1e7791460;9005 -e79b4e9d9795946f9e5cdce4ad3de000df404550;9005 +8a3491626463e09c7abb6758b349e331263ef24a;8918 +4f57197c1797cb838d951f4adf3e6b84d8e4e355;8952 +ad68afed926243c71b36b434c8eca0464e748375;8957 +cf928cd2e7ee3c5b0618146c373175c33cb8bf10;8972 +12c2f177c29ff29a9cac92d53c40fcf740acd186;8999 +be15da25a0e9bf8999d07ba412ed579720055ad1;8999 +e79b4e9d9795946f9e5cdce4ad3de000df404550;9002 +b6a8a7aad1cd3b36429470e64eb389b1e7791460;9004 f1069e250eaf970a599959b95868e10d6728263c;9009 d28d7275f34c7f518f04c2d4e8c16a47efae0d80;9012 71623b48fa3e17d320eb8e0ed27d32d0b52fb179;9019 @@ -894,9 +894,9 @@ ed8382b5a69ce2700a2433b84f94cc1c17d341fd;9019 891311f6514cb57f0cb031ce64c12e980f80bcd3;9033 ae76f8368eec47bf1265d5831f87801ca83fd9b2;9033 -12b16f57ebb81f163045696e9e46e7e4a3da881d;9072 -e7277db8a4f372fcdf7f1fdcec90c4d0c9524472;9126 -86d45663d38503bdcfeb79e862c30c09b3e1c6d1;9187 +12b16f57ebb81f163045696e9e46e7e4a3da881d;9071 +e7277db8a4f372fcdf7f1fdcec90c4d0c9524472;9125 +86d45663d38503bdcfeb79e862c30c09b3e1c6d1;9186 481729135d7deb80c2d0cfa13a604473d559bb27;9426 db8d3bc546bd35a7b4a9713116be90203da4b428;9523 98e24327371ffa0e72002af5173f8193a1d04980;9525 @@ -904,36 +904,36 @@ e0f138e00b9a794a36aeeb58d0152bb0f321ad38;9714 5630f3a5241863f446de3b5d028cda2d8dfd57d8;9857 08dcf6052e2d2d2084db7da5f4acac49b1872fff;9861 -960a2cbba14c86c8e94650b9e97b77b5b675fb1e;9861 -b75f5efe246093f1ad59ee8c8e40e8900c9b4fb2;9861 -e339330720c2aa652bedd1524eea870d4bed26ea;9861 +960a2cbba14c86c8e94650b9e97b77b5b675fb1e;9860 +b75f5efe246093f1ad59ee8c8e40e8900c9b4fb2;9860 +e339330720c2aa652bedd1524eea870d4bed26ea;9860 a00ce43b0f14910a98554fc297adad0e147f4354;9863 cecca6164b72d4f992737f25fc342e8727419af1;9868 -6376e48984fbeca5c5ab6d894dc9ab3524bfd71f;9876 -b7a9cac2a71764b858052a17c96035c48f6af511;9876 +6376e48984fbeca5c5ab6d894dc9ab3524bfd71f;9875 +b7a9cac2a71764b858052a17c96035c48f6af511;9875 110f76fc8b27b735b6eb8e123e0d57877ad4124d;9878 ce32b9fb18c869931962b62204c159525c092f5c;9878 ac22836b76823541da38609e240447e3f5710576;9887 b5cc284569c2fe5bc5d0d7e321cb16762f9451f5;9887 -3a0d390b8d74ee58a2b7bf8372e9978643cd54f2;9894 -55c87dc43ffee2021c310beed75fcfb9ce8dd0e3;9894 -76cbde9867648b3bdf08798d8d66a4514f243644;9894 +3a0d390b8d74ee58a2b7bf8372e9978643cd54f2;9893 +55c87dc43ffee2021c310beed75fcfb9ce8dd0e3;9893 +76cbde9867648b3bdf08798d8d66a4514f243644;9893 d3e3097c46e5536fe4945e73b83dbb0975d680f7;9929 -55018cc1f4413c361e3a7b328846164eb1d73fba;9943 +55018cc1f4413c361e3a7b328846164eb1d73fba;9941 +f6b84e12848296a2cbdc16f0621a78af8f6164f8;9942 73bbf65638616e8db8901776b5b73fc16781fee5;9943 c1373d4e703713002cd56ce52b3a96d7635509b8;9943 -f6b84e12848296a2cbdc16f0621a78af8f6164f8;9943 +6289200dd1a70e09f46b24b07c93015649f70e76;9972 3a24758d5aad119d90c0164b1bffc4c5531b25b9;9973
[brlcad-commits] SF.net SVN: brlcad:[78367] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78367 http://sourceforge.net/p/brlcad/code/78367 Author: starseeker Date: 2021-03-03 17:24:14 + (Wed, 03 Mar 2021) Log Message: --- Start working through svn/git diffs to identify corrections to revisions. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 15:49:33 UTC (rev 78366) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 17:24:14 UTC (rev 78367) @@ -37,13 +37,13 @@ de43b627fabc592beb6c8fc85edaddd2156f;91 fd8babe28f66e3a96b546c1317dd3e959fd9eb9d;91 fe2ed019e29e3bbae3a071a6d584a332d545b615;91 -ed8938c786dad64529057d6e48655ddfda569bd6;103 +ed8938c786dad64529057d6e48655ddfda569bd6;102 2d5d1f2bb03342b0d7cbb63741d9a149bd5bdd9a;131 0b8e58cf9bdf4fc4176a5d8529b9ed03b0f1e01b;139 a6030788faffd9f28dd8a619a527217cb3631dd2;256 10891054d72e8a9c71ae0d409cf41ab73fdeebbb;259 cad8629fd4b7c7167f598b1f4713a284d2fd9c3b;259 -d7c39260349cf7e4aadaa0bb1aa14c779bc85d2e;270 +d7c39260349cf7e4aadaa0bb1aa14c779bc85d2e;269 7705f04f59b0a63da331ffe7430449332f972ab7;276 906457353e90844830124aa4a9f08225448b3dd0;290 9036ef90404e0b9dd5f141146f96b17f2d3fed46;305 @@ -53,10 +53,10 @@ 65fe5dcf39e51bc8c02d4a33c5e6bdc1a310151d;493 b547003813352fbbbe2914adfa1d0f86ee118e07;493 b609d360699c67f028bcc088d9ac2bac22a6c898;493 -47dbef390d420864e0eb4c61bcb0b7d9db0d3201;527 +961cbc9a60999ef176301319892ccce0ebeb3850;525 +8d56b421e2f846e8b3dc7a5f989a3015458d45a3;525 +47dbef390d420864e0eb4c61bcb0b7d9db0d3201;526 73dc291ec459e37ce2c9aa2807c1d6065958a88d;527 -8d56b421e2f846e8b3dc7a5f989a3015458d45a3;527 -961cbc9a60999ef176301319892ccce0ebeb3850;527 5b9eb3d4f97689deca7cb1dcb3d2162aa41ff566;552 f22d53a5d76436d711e4dd76667f01886bcbafa8;552 0c028d023f06de676b5b1d968c1d8fb1bb106729;568 @@ -727,16 +727,16 @@ 0864f161fee4baff1f39c154c370dcb9db051819;4017 0fe95e56d65047d8505c9e86b5f3dcdfcba5d092;4017 bec6f12a0ff0d2a25e7aaf84ba55b267efeb050f;4077 -79873557412c5b003816ef35c6b4aeb0aad72baf;4323 +79873557412c5b003816ef35c6b4aeb0aad72baf;4321 554620ca9d355a412f8c7de2e312ac5165039dd2;4524 6510d5c52356b1a2a8069220e06857f4102689e6;4524 e5fa95d172ba7f4d329f76738dcd1babc1c663ab;4524 -0ecb586939e7cb921c3a78d5708d7bc5e8df13a8;4669 -de26c5f2e7931e087c624b5451610d40dd1fc7ec;4669 +0ecb586939e7cb921c3a78d5708d7bc5e8df13a8;4668 +de26c5f2e7931e087c624b5451610d40dd1fc7ec;4668 +59209a25026cc7ffdfd9bc5c9e20b05d536c8a59;4697 2545d8dba6823921ded4e44cec935a744cfb86e4;4698 -59209a25026cc7ffdfd9bc5c9e20b05d536c8a59;4698 3a9fe3ca74dd50c55b6102bc40eb1c5683044711;4702 -bd8189103872e05327480b3db8a8bcb122d4e502;4890 +bd8189103872e05327480b3db8a8bcb122d4e502;4889 ea67b6b0a11a9f6aa405af1a85c85a3204ed3cf7;4891 8ef313245ffbc74f554deadec598ff6dc6beb83e;4921 8f15ff80eb5e949c4b4eb1581843d35489560f38;4921 @@ -743,10 +743,10 @@ 3a7911d9f50e8aa847aacb85fa1e6da86229cf9b;4931 6157a0c33c5565aee6588d99bebb2e27be60333b;5074 8cfaf3363a0644a7904e4d3a09da7978e94630bb;5141 -eeb7cfaa353aca3259df37264807df8632a24e03;5142 -0f497f84e18587fb302d1d6e65100d0bc7bb259e;5192 +eeb7cfaa353aca3259df37264807df8632a24e03;5141 +0f497f84e18587fb302d1d6e65100d0bc7bb259e;5191 465f35fc9553bb74f03730d2f06f06469eafbf78;5197 -09a774da0ead526eab11dbc5319e1335268f45a6;5208 +09a774da0ead526eab11dbc5319e1335268f45a6;5207 e75443d252e4607c696c43e3da0caf641503d5a4;5208 fe3c685f1ea99964fc9d96ed81488d5642c870a8;5422 003b03f78fdcc5ad51267fe132798f42860de523;5446 @@ -773,7 +773,7 @@ 0191686b314fff22b845b2e50aa4f8399d5a38b2;5545 2133f4571bb06263c75a8385b08206ec022f5de3;5631 cdda2e9d63ab91d4c79f0a47480a5f0655db371f;5631 -d2dc6a43986c1a871b064abeb98fae8dfa32a8b4;5667 +d2dc6a43986c1a871b064abeb98fae8dfa32a8b4;5666 feaaf0a5e4e2560f85f19a16db713b0bcf6518fa;5734 ffceec8a7e4227042b531285d419b96b500e5ebf;5734 cdceaacbbe9b8fa7f88ce3bff1294a7e846d457b;5781 @@ -784,21 +784,21 @@ 1602f5592d7602cbcbe430887b29ad28d7d78fdb;5907 6a28f149285c443d7c5f2d4626de152a4b5a319f;5907 fcce07977613478754683cc8973080b5ccb168fe;5907 -7c6de173a980da19a62d4359c26857ed8b6f73d0;5920 +7c6de173a980da19a62d4359c26857ed8b6f73d0;5919 95e21e8c4d4ad682fb3b2dc6c98100386ac66d7a;5920 bdff1bc94373305929b1b6398d0d8f949e55e2a3;5920 4b144b962aab908af92bde958a2756825cbb4762;5979 ea4d6e07fef9433a337eca7cfb584d2929a4a13f;5979 -7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6345 +7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6344 837f243e290d6b4870e59c545a405c9fee71027e;6441 db7d89e8dea67d9a3dda6b2d33425185154f3b1d;6478 e847ab502326201f7e47fd50d81d227653737831;6478 49af06eed009659362295191f220321382f210ed;6486 fe4283b0f7ad47c2ebc8da2c4a47c52ac1c49f7d;6486 -2e715e80a73f27667f52fdac3c7dab24bfac33d9;6490 -1e12763a7116cee063635c3c357fda8e02e0b901;6627 +2e715e80a73f27667f52fdac3c7dab24bfac33d9;6489 +1e12763a7116cee063635c3c357fda8e02e0b901;6626
[brlcad-commits] SF.net SVN: brlcad:[78366] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78366 http://sourceforge.net/p/brlcad/code/78366 Author: starseeker Date: 2021-03-03 15:49:33 + (Wed, 03 Mar 2021) Log Message: --- Think we've identified these commits, or at least their closest mapping available in the Git history... Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 15:35:50 UTC (rev 78365) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 15:49:33 UTC (rev 78366) @@ -1,7 +1,3 @@ -a098425430db227021617976961e6b51ce5569cb; -a7c85f280677d70b8eef9aadf79302736ed26ffc; -e6417be98f27d570d863744f566f5aaf738abbe6; -f5a1b0037fec2927cba073d118db24cdbd681975; 0754c7bffb0fb9f2e9c9ff83b4a0e0901ca41d60;11 182ad44b135260562999a6c43e7260fb3cefa776;11 25e98524ec59558eb60ffe948f94d0fcc47e01ce;11 @@ -1365,3 +1361,4 @@ a098425430db227021617976961e6b51ce5569cb;19760 e6417be98f27d570d863744f566f5aaf738abbe6;19762 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78365] brlcad/trunk/misc/repoconv
Revision: 78365 http://sourceforge.net/p/brlcad/code/78365 Author: starseeker Date: 2021-03-03 15:35:50 + (Wed, 03 Mar 2021) Log Message: --- Set update rev numbers for scriptics commits Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-03-03 15:28:28 UTC (rev 78364) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-03-03 15:35:50 UTC (rev 78365) @@ -251,5 +251,5 @@ 41951b0aaa915e96a79d5de7811d859fca6f00ca:scriptics f8fa716f5077cdde438f676c1b24244a09eb3fcd:libpng -e85b06be0fa6632e097d8c728506ab5251a2b635;zlib +e85b06be0fa6632e097d8c728506ab5251a2b635:zlib Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 15:28:28 UTC (rev 78364) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-03-03 15:35:50 UTC (rev 78365) @@ -1360,3 +1360,8 @@ ffe045a1b9b58d441f37b9e57eaf611741841c0c;22484 cbe940468837a76420db9d89e8a34ceea017e0d4;21557 +a7c85f280677d70b8eef9aadf79302736ed26ffc;19756 +f5a1b0037fec2927cba073d118db24cdbd681975;19758 +a098425430db227021617976961e6b51ce5569cb;19760 +e6417be98f27d570d863744f566f5aaf738abbe6;19762 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78364] brlcad/trunk/misc/repoconv
Revision: 78364 http://sourceforge.net/p/brlcad/code/78364 Author: starseeker Date: 2021-03-03 15:28:28 + (Wed, 03 Mar 2021) Log Message: --- Add VendorARL deletion commit, update CVS branches to match SVN. Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Added Paths: --- brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-03-03 15:26:39 UTC (rev 78363) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-03-03 15:28:28 UTC (rev 78364) @@ -250,3 +250,6 @@ e6417be98f27d570d863744f566f5aaf738abbe6:scriptics 41951b0aaa915e96a79d5de7811d859fca6f00ca:scriptics +f8fa716f5077cdde438f676c1b24244a09eb3fcd:libpng +e85b06be0fa6632e097d8c728506ab5251a2b635;zlib + Added: brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi === (Binary files differ) Index: brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi 2021-03-03 15:26:39 UTC (rev 78363) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi 2021-03-03 15:28:28 UTC (rev 78364) Property changes on: brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78363] brlcad/trunk/misc/repowork
Revision: 78363
http://sourceforge.net/p/brlcad/code/78363
Author: starseeker
Date: 2021-03-03 15:26:39 + (Wed, 03 Mar 2021)
Log Message:
---
Add ability to add commit without splicing
Modified Paths:
--
brlcad/trunk/misc/repowork/commit.cpp
brlcad/trunk/misc/repowork/repowork.cpp
brlcad/trunk/misc/repowork/repowork.h
Modified: brlcad/trunk/misc/repowork/commit.cpp
===
--- brlcad/trunk/misc/repowork/commit.cpp 2021-03-03 14:13:28 UTC (rev
78362)
+++ brlcad/trunk/misc/repowork/commit.cpp 2021-03-03 15:26:39 UTC (rev
78363)
@@ -514,7 +514,74 @@
return 0;
}
+int
+parse_add_commit(git_fi_data *fi_data, std::ifstream )
+{
+//std::cout << "Found command: commit\n";
+git_commit_data gcd;
+gcd.s = fi_data;
+
+// Tell the commit where it will be in the vector - this
+// uniquely identifies this specific commit, regardless of
+// its sha1.
+gcd.id.index = fi_data->commits.size();
+
+std::map cmdmap;
+// Commit info modification commands
+cmdmap[std::string("author")] = commit_parse_author;
+cmdmap[std::string("commit ")] = commit_parse_commit; // Note - need space
after commit to avoid matching committer!
+cmdmap[std::string("committer")] = commit_parse_committer;
+cmdmap[std::string("data")] = commit_parse_data;
+cmdmap[std::string("encoding")] = commit_parse_encoding;
+cmdmap[std::string("from")] = commit_parse_from;
+cmdmap[std::string("mark")] = commit_parse_mark;
+cmdmap[std::string("merge")] = commit_parse_merge;
+cmdmap[std::string("original-oid")] = commit_parse_original_oid;
+
+// tree modification commands
+cmdmap[std::string("C ")] = commit_parse_filecopy;
+cmdmap[std::string("D ")] = commit_parse_filedelete;
+cmdmap[std::string("M ")] = commit_parse_filemodify;
+cmdmap[std::string("N ")] = commit_parse_notemodify;
+cmdmap[std::string("R ")] = commit_parse_filerename;
+cmdmap[std::string("deleteall")] = commit_parse_deleteall;
+
+std::string line;
+size_t offset = infile.tellg();
+int commit_done = 0;
+while (!commit_done && std::getline(infile, line)) {
+
+ commitcmd_t cc = commit_find_cmd(line, cmdmap);
+
+ // If we found a command, process it. Otherwise, we are done
+ // with the commit and need to clean up.
+ if (cc) {
+ //std::cout << "commit line: " << line << "\n";
+ infile.seekg(offset);
+ (*cc)(, infile);
+ offset = infile.tellg();
+ } else {
+ // Whatever was on that line, it's not a commit input.
+ // Reset input to allow the parent routine to deal with
+ // it, and return.
+ infile.seekg(offset);
+ commit_done = 1;
+ }
+}
+
+gcd.id.mark = fi_data->next_mark(gcd.id.mark);
+fi_data->mark_to_index[gcd.id.mark] = gcd.id.index;
+
+//std::cout << "commit new mark: " << gcd.id.mark << "\n";
+
+// Add the commit to the data
+fi_data->commits.push_back(gcd);
+
+return 0;
+}
+
+
void
write_op(std::ofstream , git_op *o)
{
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-03-03 14:13:28 UTC (rev
78362)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-03-03 15:26:39 UTC (rev
78363)
@@ -1102,11 +1102,62 @@
}
int
+parse_add_fi_file(git_fi_data *fi_data, std::ifstream )
+{
+std::map cmdmap;
+cmdmap[std::string("alias")] = parse_alias;
+cmdmap[std::string("blob")] = parse_blob;
+cmdmap[std::string("cat-blob")] = parse_cat_blob;
+cmdmap[std::string("checkpoint")] = parse_checkpoint;
+cmdmap[std::string("commit ")] = parse_add_commit;
+cmdmap[std::string("done")] = parse_done;
+cmdmap[std::string("feature")] = parse_feature;
+cmdmap[std::string("get-mark")] = parse_get_mark;
+cmdmap[std::string("ls")] = parse_ls;
+cmdmap[std::string("option")] = parse_option;
+cmdmap[std::string("progress")] = parse_progress;
+cmdmap[std::string("reset")] = parse_reset;
+cmdmap[std::string("tag")] = parse_tag;
+
+size_t offset = infile.tellg();
+std::string line;
+std::map::iterator c_it;
+while (std::getline(infile, line)) {
+ // Skip empty lines
+ if (!line.length()) {
+ offset = infile.tellg();
+ continue;
+ }
+
+ gitcmd_t gc = gitit_find_cmd(line, cmdmap);
+ if (!gc) {
+ //std::cerr << "Unsupported command!\n";
+ offset = infile.tellg();
+ continue;
+ }
+
+ // If we found a command, process it
+ //std::cout << "line: " << line << "\n";
+ // some commands have data on the command line - reset seek so the
+ // callback can process it
+ infile.seekg(offset);
+ (*gc)(fi_data, infile);
+ offset
[brlcad-commits] SF.net SVN: brlcad:[78362] brlcad/trunk/misc/repoconv
Revision: 78362 http://sourceforge.net/p/brlcad/code/78362 Author: starseeker Date: 2021-03-03 14:13:28 + (Wed, 03 Mar 2021) Log Message: --- There may be a few more of this sort - organize Modified Paths: -- brlcad/trunk/misc/repoconv/remove_commits.txt Added Paths: --- brlcad/trunk/misc/repoconv/repowork_new_commmits/ brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2 brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi Removed Paths: - brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 brlcad/trunk/misc/repoconv/r66607_trunk.fi Deleted: brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 === --- brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-03-03 06:01:01 UTC (rev 78361) +++ brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-03-03 14:13:28 UTC (rev 78362) @@ -1,12 +0,0 @@ -commit refs/heads/cjohnson-mac-hack -author Christopher Johnson 625826935 + -committer Phillip Dykstra 625826935 + -data 88 -Chris Johnson's Mac Hack - -svn:revision:3698 -cvs:branch:unlabeled-9.7.1 -cvs:account:phil -from df207709f5474f88155bf37d91a9dd855ad02f53 -deleteall -M 100644 8684ce993e973b87c057cb7bad43a84c71ffe704 libfb/if_X.c Deleted: brlcad/trunk/misc/repoconv/r66607_trunk.fi === (Binary files differ) Modified: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-03 06:01:01 UTC (rev 78361) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-03 14:13:28 UTC (rev 78362) @@ -48,6 +48,16 @@ 93f11839e27976820f0c47477d3de3f9f1bcc4e4 # RCS header changes, no commit message, now a no-op 8f7f999bd6c61446f24c5117d0f0a1dc1d83c10c # RCS header changes, no commit message, now a no-op + +# Spurious branch deletes +004ec0ae439f0ca3c814d22a46957012cd8fb239 +f206b315ca475d3a3e55e98ec42d772c6b05baee +cbff64617866cc3fc2b25db15cd610e651561958 +87bc784daf7f15cc8d9c9fa980a934a98a17de95 +720f9b9b75588e35d3cce0f9f5b802abea2259ab +d748c2ea214b699008563e18f5a7105de39faba9 + + # The following are all empty commits of the form "file N was initially added on branch M" ea9c83e50fa49cdad8dc0bb114f618abb6f69f0c Copied: brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2 (from rev 78361, brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2) === --- brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2 (rev 0) +++ brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-03-03 14:13:28 UTC (rev 78362) @@ -0,0 +1,12 @@ +commit refs/heads/cjohnson-mac-hack +author Christopher Johnson 625826935 + +committer Phillip Dykstra 625826935 + +data 88 +Chris Johnson's Mac Hack + +svn:revision:3698 +cvs:branch:unlabeled-9.7.1 +cvs:account:phil +from df207709f5474f88155bf37d91a9dd855ad02f53 +deleteall +M 100644 8684ce993e973b87c057cb7bad43a84c71ffe704 libfb/if_X.c Copied: brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi (from rev 78361, brlcad/trunk/misc/repoconv/r66607_trunk.fi) === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78360] brlcad/trunk/misc/repoconv/verify2/ checkout_check_parallel.sh
Revision: 78360 http://sourceforge.net/p/brlcad/code/78360 Author: starseeker Date: 2021-03-03 04:14:18 + (Wed, 03 Mar 2021) Log Message: --- Strip empty files/directories from comparisons. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh Modified: brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh === --- brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh 2021-03-01 21:48:29 UTC (rev 78359) +++ brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh 2021-03-03 04:14:18 UTC (rev 78360) @@ -28,10 +28,12 @@ svn checkout -r$REV file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV 1>/dev/null 2>/dev/null BRANCHDIR="r$REV/$BRANCH" fi - DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision' -I'$Header' -I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore" --exclude ".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude ".svn" --exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR > r$REV.diff) + find g$REV/ -empty -delete + find $BRANCHDIR/ -empty -delete + DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision' -I'$Header' -I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore" --exclude ".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude ".svn" --exclude "saxon65.jar" --exclude "xalan27.jar" --exclude "cup.g" --exclude "Cup.g" --exclude "xm4.asc" --exclude "dde1.1" --exclude "reg1.0" --exclude "libitcl" --exclude "cvs2cl.pl" --exclude "mug.jpg" --exclude "alias-pix.txt" g$REV $BRANCHDIR > r$REV.diff) if [ -s r$REV.diff ] then - echo "$REV: difference found\n" + echo "$REV: difference found" else rm r$REV.diff fi @@ -43,4 +45,3 @@ cd $CWD fi rm -rf g$REV - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78359] brlcad/trunk/misc/repoconv/verify2/ checkout_check_parallel.sh
Revision: 78359
http://sourceforge.net/p/brlcad/code/78359
Author: starseeker
Date: 2021-03-01 21:48:29 + (Mon, 01 Mar 2021)
Log Message:
---
Don't try any checkouts if we don't have the necessary info.
Modified Paths:
--
brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
Modified: brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
===
--- brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
2021-03-01 21:21:18 UTC (rev 78358)
+++ brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
2021-03-01 21:48:29 UTC (rev 78359)
@@ -10,27 +10,37 @@
cd $CWD
git -c advice.detachedHead=false clone $GITREPO g$REV && cd g$REV
BRANCH=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%B" |grep
:branch:|awk -F':' '{print $3}'|uniq)
-SHA1=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H" |head
-n 1)
-echo "$REV -> $SHA1"
-echo "BRANCH=$BRANCH"
-git -c advice.detachedHead=false checkout $SHA1
-cd $CWD
-BRANCHDIR=""
-if [ "$BRANCH" == "trunk" ]
+if [ "$BRANCH" != "" ]
then
- svn checkout -r$REV file://$SVNREPO/brlcad/trunk@$REV r$REV 1>/dev/null
2>/dev/null
- BRANCHDIR="r$REV"
+ SHA1=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H"
|head -n 1)
+ if [ "$SHA1" != "" ]
+ then
+ echo "$REV -> $SHA1"
+ echo "BRANCH=$BRANCH"
+ git -c advice.detachedHead=false checkout $SHA1
+ cd $CWD
+ BRANCHDIR=""
+ if [ "$BRANCH" == "trunk" ]
+ then
+ svn checkout -r$REV file://$SVNREPO/brlcad/trunk@$REV
r$REV 1>/dev/null 2>/dev/null
+ BRANCHDIR="r$REV"
+ else
+ svn checkout -r$REV
file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV 1>/dev/null 2>/dev/null
+ BRANCHDIR="r$REV/$BRANCH"
+ fi
+ DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision'
-I'$Header' -I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore"
--exclude ".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude
".svn" --exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR >
r$REV.diff)
+ if [ -s r$REV.diff ]
+ then
+ echo "$REV: difference found\n"
+ else
+ rm r$REV.diff
+ fi
+ rm -rf r$REV
+ else
+ cd $CWD
+ fi
else
- svn checkout -r$REV file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV
1>/dev/null 2>/dev/null
- BRANCHDIR="r$REV/$BRANCH"
+ cd $CWD
fi
-DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision' -I'$Header'
-I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore" --exclude
".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude ".svn"
--exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR > r$REV.diff)
-if [ -s r$REV.diff ]
-then
- echo "$REV: difference found\n"
-else
- rm r$REV.diff
-fi
-rm -rf r$REV
rm -rf g$REV
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78358] brlcad/trunk/misc/repoconv/verify2/ checkout_check_parallel.sh
Revision: 78358
http://sourceforge.net/p/brlcad/code/78358
Author: starseeker
Date: 2021-03-01 21:21:18 + (Mon, 01 Mar 2021)
Log Message:
---
Try setting up a checkout based comparator. Can be run with parallel: cat
cad_revs.txt | parallel ./checkout_check_parallel.sh
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
Added: brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
===
--- brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
2021-03-01 21:21:18 UTC (rev 78358)
@@ -0,0 +1,36 @@
+#!/bin/bash
+CWD=$(pwd)
+
+SVNREPO=/home/user/repo_dercs
+GITREPO=/home/user/brlcad_conv16
+REV=$1
+
+rm -rf r$REV g$REV
+
+cd $CWD
+git -c advice.detachedHead=false clone $GITREPO g$REV && cd g$REV
+BRANCH=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%B" |grep
:branch:|awk -F':' '{print $3}'|uniq)
+SHA1=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H" |head
-n 1)
+echo "$REV -> $SHA1"
+echo "BRANCH=$BRANCH"
+git -c advice.detachedHead=false checkout $SHA1
+cd $CWD
+BRANCHDIR=""
+if [ "$BRANCH" == "trunk" ]
+then
+ svn checkout -r$REV file://$SVNREPO/brlcad/trunk@$REV r$REV 1>/dev/null
2>/dev/null
+ BRANCHDIR="r$REV"
+else
+ svn checkout -r$REV file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV
1>/dev/null 2>/dev/null
+ BRANCHDIR="r$REV/$BRANCH"
+fi
+DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision' -I'$Header'
-I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore" --exclude
".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude ".svn"
--exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR > r$REV.diff)
+if [ -s r$REV.diff ]
+then
+ echo "$REV: difference found\n"
+else
+ rm r$REV.diff
+fi
+rm -rf r$REV
+rm -rf g$REV
+
Property changes on:
brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78357] brlcad/trunk/misc/repoconv/verify2/ rev_approx_check.sh
Revision: 78357 http://sourceforge.net/p/brlcad/code/78357 Author: starseeker Date: 2021-03-01 14:10:19 + (Mon, 01 Mar 2021) Log Message: --- separation to group log and results Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh Modified: brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh === --- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 14:06:58 UTC (rev 78356) +++ brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 14:10:19 UTC (rev 78357) @@ -86,5 +86,7 @@ echo "both diffs empty" fi fi + echo "" + echo "" done < $input_file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78356] brlcad/trunk/misc/repoconv/verify2/ rev_approx_check.sh
Revision: 78356 http://sourceforge.net/p/brlcad/code/78356 Author: starseeker Date: 2021-03-01 14:06:58 + (Mon, 01 Mar 2021) Log Message: --- show the log message so we have a little context Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh Modified: brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh === --- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 13:20:59 UTC (rev 78355) +++ brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 14:06:58 UTC (rev 78356) @@ -38,7 +38,7 @@ mv intmp $input_file while read i; do REV=$i - echo "$REV:" + svn log -c$REV file://$SVNREPO cd $GITREPO git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H" > rev_shas.txt echo "" >> rev_shas.txt @@ -47,7 +47,6 @@ SHA1=$i if [ "$SHA1" != "" ] then - echo "$SHA1" git diff $SHA1^! ':(exclude).gitignore' |grep "^[-+].*"|grep -v "[-][-][-]" | grep -v "+++" | grep -v "^[-]$"|grep -v "^+$" >> diffcontents.txt fi done < rev_shas.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78355] brlcad/trunk/misc/repoconv/verify2/ rev_approx_check.sh
Revision: 78355 http://sourceforge.net/p/brlcad/code/78355 Author: starseeker Date: 2021-03-01 13:20:59 + (Mon, 01 Mar 2021) Log Message: --- whoops, helps to use the input file Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh Modified: brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh === --- brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 13:19:19 UTC (rev 78354) +++ brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh 2021-03-01 13:20:59 UTC (rev 78355) @@ -59,6 +59,8 @@ then if [ -s gitdiff ] then + md5sum svndiff + md5sum gitdiff ssdeep -b svndiff 2>/dev/null > svndiff.hash SCORE=$(ssdeep -bm svndiff.hash gitdiff 2>/dev/null|cut -c 37-) if [ "$SCORE" != "" ] @@ -85,5 +87,5 @@ echo "both diffs empty" fi fi -done < revs.txt +done < $input_file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78354] brlcad/trunk/misc/repoconv/verify2
Revision: 78354
http://sourceforge.net/p/brlcad/code/78354
Author: starseeker
Date: 2021-03-01 13:19:19 + (Mon, 01 Mar 2021)
Log Message:
---
Add some more utility scripts for repo comparison
Having assigned SVN revisions to most of the git commits,
that opens up another option for comparison - generating
diff sets from multiple git SHA1 commits that should
correspond to SVN commits, and looking for differences.
In an initial trial, a little less than 10% don't generate
matching diffs. We've observed what appear to be occasional
differences in how SVN and git calculate their diffs. Since
MD5 sum comparison only works when the diffs are exactly the
same, the approximate matching script uses ssdeep and comm
instead to get a sense of how different the two patches are.
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/check.cxx
brlcad/trunk/misc/repoconv/verify2/git_revsets.sh
brlcad/trunk/misc/repoconv/verify2/rev_approx_check.sh
Added: brlcad/trunk/misc/repoconv/verify2/check.cxx
===
--- brlcad/trunk/misc/repoconv/verify2/check.cxx
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/check.cxx2021-03-01 13:19:19 UTC
(rev 78354)
@@ -0,0 +1,110 @@
+#include
+#include
+#include
+#include
+#include
+
+int
+read_map_file(std::map , const char *file, int
rev, std::set *non_cad_revs)
+{
+std::ifstream in_stream(file, std::ifstream::binary);
+if (in_stream.good()) {
+ std::string line;
+ while (std::getline(in_stream, line)) {
+ // Skip empty lines
+ if (!line.length()) {
+ continue;
+ }
+
+ size_t spos = line.find_first_of(";");
+ if (spos == std::string::npos) {
+ std::cerr << "Invalid map line!: " << line << "\n";
+ exit(-1);
+ }
+
+ std::string id1 = line.substr(0, spos);
+ std::string id2 = line.substr(spos+1, std::string::npos);
+
+
+ if (non_cad_revs) {
+ // If we have a set to check, skip anything having to do with
+ // a non-cad revision
+ if (non_cad_revs->find(id1) != non_cad_revs->end())
+ continue;
+ if (non_cad_revs->find(id2) != non_cad_revs->end())
+ continue;
+ }
+
+
+ if (!rev) {
+ if (id2.length())
+ map[id1] = id2;
+ } else {
+ if (id1.length())
+ map[id2] = id1;
+ }
+ }
+
+ in_stream.close();
+}
+
+return 0;
+}
+
+int
+read_set_file(std::set , const char *file)
+{
+std::ifstream in_stream(file, std::ifstream::binary);
+if (in_stream.good()) {
+ std::string line;
+ while (std::getline(in_stream, line)) {
+ // Skip empty lines
+ if (!line.length()) {
+ continue;
+ }
+ if (line.length())
+ set.insert(line);
+ }
+ in_stream.close();
+}
+
+return 0;
+}
+
+int
+main(int argc, const char **argv)
+{
+std::map::iterator b_it;
+
+if (argc != 4) {
+ std::cerr << "check svn_diffs.txt git_diffs.txt non_cad.txt\n";
+ return -1;
+}
+
+std::set non_cad_revs;
+read_set_file(non_cad_revs, argv[6]);
+
+std::map svn_rev_to_contents;
+read_map_file(svn_rev_to_contents, argv[1], 1, _cad_revs);
+
+std::map git_rev_to_contents;
+read_map_file(git_rev_to_contents, argv[2], 1, NULL);
+
+// First pass - find any revs that don't have unique commit message matches
+for (b_it = git_rev_to_contents.begin(); b_it !=
git_rev_to_contents.end(); b_it++) {
+ std::string svn_md5 = svn_rev_to_contents[b_it->first];
+ if (svn_md5 != b_it->second) {
+ std::cout << b_it->first << "\n";
+ }
+}
+return 0;
+}
+
+// Local Variables:
+// tab-width: 8
+// mode: C++
+// c-basic-offset: 4
+// indent-tabs-mode: t
+// c-file-style: "stroustrup"
+// End:
+// ex: shiftwidth=4 tabstop=8
Property changes on: brlcad/trunk/misc/repoconv/verify2/check.cxx
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/verify2/git_revsets.sh
===
--- brlcad/trunk/misc/repoconv/verify2/git_revsets.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/git_revsets.sh 2021-03-01 13:19:19 UTC
(rev 78354)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+rm -f revs.txt git_diffs.txt diffcontents.txt diffsorted.txt rev_shas.txt
revs_raw.txt
+git log --all |grep svn:revision|awk -F':' '{print $3}'|sort -n|uniq >
revs_raw.txt
+tail -n +2 revs_raw.txt > revs.txt
+rm -f revs_raw.txt
+
[brlcad-commits] SF.net SVN: brlcad:[78353] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78353 http://sourceforge.net/p/brlcad/code/78353 Author: starseeker Date: 2021-02-28 23:50:06 + (Sun, 28 Feb 2021) Log Message: --- Go through the rest of the unmapped commits - appear to be a consequence of the libitcl directory not making it into the SVN conversion. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-28 23:07:14 UTC (rev 78352) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-28 23:50:06 UTC (rev 78353) @@ -65,8 +65,53 @@ commit didn't make the cvs->svn jump, but did get recorded in git. +250b57ecc2a4d24bececd3c77aba95e814376389 - doesn't seem to have a matching SVN commit +cd2a4b7fbb9f31c78a7002039fc5acd89efc6932 - doesn't seem to have a matching SVN commit +c204302c788238eea235783e6c2be0cabace3d78 - doesn't seem to have a matching SVN commit + +b8bd49360c64e81e7a05dcaddf2aa31a00785584 - doesn't seem to have a matching SVN commit + +99084ce1bf722d0cd87e286ec42912016b2b12c5 - trunk SVN circa 19545 doesn't have a libitcl directory + +510035faed01759ccdc8f61d22a36ba8238a114a - trunk SVN circa 19355 doesn't have a libitcl directory + +b7bbd039d8add110f7ff84e8db91b5703dd16a49 - trunk SVN circa 19340 doesn't have a libitcl directory + +056021ffa476bfa40e7a8307bc758f0d418df092 - trunk SVN circa 18983 doesn't have a libitcl directory + +0b3a9dcc203bcffcf30b04db05acd945fb5cbcf6 - trunk SVN circa 18925 doesn't have a libitcl directory + +2090923f990f4542040e0e82297d8e693317199a - trunk SVN circa 18869 doesn't have a libitcl directory + +c98d05897317e2b5fb2efb987f12644ec4d57c21 - trunk SVN circa 18392 doesn't have a libitcl directory + +The following appear to be similar missing-libitcl-dir-in-SVN issues: + +6ba28bc197cd1ccd777a19c3b508f0e359af6339 +1965307c7d3bfe21c26822051faf6e52d9766359 +57e39aebb555e242530456cac09dee7d125f88dd +6d18af3bc89e030ed7384cb60db8b7d61fcb65d5 +d7dde7e82018a1c88401bb36f38d98f02553e5ed +bd95a1317ea88a16453f30e83ede58f464a16e92 +4fc5a41b58ee97e8d4f4633e881ad473ac608c04 +eb3a2afbc5d4f5f636dad1cecb70ddd54848aee7 +b7e30be018dcdca82bc8700e27c6115854b2b20c +9a026cdb0fa2f9fed696d61f63744c526b628f51 +1170365016910605530fb5d39133acaed716b7e3 +4f5f4023546b6b3b766ad3207fb853e818b1de1b +ae464fadce31471a5b6ca71f521ad62589223aef +c3314d00dccb8812c2e7d3b98f7930c937f17e24 +321c5f18ed60653b89a472f49270b4953a8b3cc3 +b54a7c5cf2e2b416c0c1b9ab22d2e8eff0bb0098 +0f52b4eba514c813dc64b99c03853896ee5fcd37 +be1900dba53a0d3bc82747bc9761502f1e4b0e80 + + + + + df5a981a54d93aec7322503c0ce322eb157bf538;714 5477169081053dc2f8627ed6362d4b56ae2f7c58;714 e8eb301a7dba29f519014119d6493455a81a5b35;715 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78352] brlcad/trunk/misc/repoconv
Revision: 78352 http://sourceforge.net/p/brlcad/code/78352 Author: starseeker Date: 2021-02-28 23:07:14 + (Sun, 28 Feb 2021) Log Message: --- More hunting... I think some of the 'mystery' itcl commits may be coming from a CVS scriptics branch that doesn't appear to have made the translation to SVN, possibly because it looks like the scriptics branch notation/numbering in CVS may be incorrect per https://www.astro.princeton.edu/~rhl/cvs-branches.html#branchnumbers ? Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-28 13:27:45 UTC (rev 78351) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-28 23:07:14 UTC (rev 78352) @@ -244,3 +244,9 @@ 885ed4c94ec0131f2cba48ffcbb3d0e03e4ecefd:trunk e6417be98f27d570d863744f566f5aaf738abbe6:trunk +a7c85f280677d70b8eef9aadf79302736ed26ffc:scriptics +f5a1b0037fec2927cba073d118db24cdbd681975:scriptics +a098425430db227021617976961e6b51ce5569cb:scriptics +e6417be98f27d570d863744f566f5aaf738abbe6:scriptics +41951b0aaa915e96a79d5de7811d859fca6f00ca:scriptics + Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-28 13:27:45 UTC (rev 78351) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-28 23:07:14 UTC (rev 78352) @@ -1351,3 +1351,12 @@ 45cacc2e874a9fb6eaf14162a468816743b05f12;27967 964dd2d24d61d338840d214316076e7b039cff03;28785 +2692c6fa8a14b6b0f221e4afda23bb0626041c2d;22607 +9a87cb36f480f0e848445dc7a3c99a3bb094c0b3;22607 +24b47715f1f8a8d4ddb3499d682d192ea9b37f82;22552 +38ab9d3b80b25862d1ed729fadd0ca3ec3a38dc4;22550 +afd806bf472d0ac4b2685be406966a5a6eb28e5c;22521 +edf3df35c8c44492fa25cb3999788338b1f2570b;22525 +ffe045a1b9b58d441f37b9e57eaf611741841c0c;22484 +cbe940468837a76420db9d89e8a34ceea017e0d4;21557 + Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-28 13:27:45 UTC (rev 78351) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-28 23:07:14 UTC (rev 78352) @@ -61,8 +61,12 @@ Resolution - leave as is. +46e9a5fa28148f29d0f9ff2179fd7aa601105436 - parent to r21315 in git, not present in SVN. Looks as if this +commit didn't make the cvs->svn jump, but did get recorded in git. + + df5a981a54d93aec7322503c0ce322eb157bf538;714 5477169081053dc2f8627ed6362d4b56ae2f7c58;714 e8eb301a7dba29f519014119d6493455a81a5b35;715 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78351] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78351 http://sourceforge.net/p/brlcad/code/78351 Author: starseeker Date: 2021-02-28 13:27:45 + (Sun, 28 Feb 2021) Log Message: --- Missed a couple Git commit assignments. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-28 00:05:31 UTC (rev 78350) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-28 13:27:45 UTC (rev 78351) @@ -726,6 +726,7 @@ e418a2c12cf4ebffd9a3f33c0253cc21f2a72663;3755 e71c11290acdb3672377b0da50941128b918eebe;3755 ee5000727639e68b6ec6cca8c71891f2c6cbeb7d;3755 +1a6103bb3e4451e01c243cc08d2f180e2030427b;3850 fa07c8daf23dd6fd740322f31e37bdaf5084b5ae;3850 0864f161fee4baff1f39c154c370dcb9db051819;4017 0fe95e56d65047d8505c9e86b5f3dcdfcba5d092;4017 @@ -1012,6 +1013,7 @@ 2b1e087372a52f65f1921da13a0cb8dace7faa07;12512 71ddd33f066bfe5ff55f081a19dc10292e071291;12512 b4ac11ce4afba6bdbc35832fde4346786cb96985;12512 +721ed8557fb810c198151585ec70073e65f33ff0;12512 e217b19a5a1d7bc4e6d39685d8a63a980ba366f6;12515 8e34b80c1c557372a1ff297456b944815dd61c1b;12567 0075e32d970bcaf0e93f0fd7590c6576a73c3e31;12568 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78350] brlcad/trunk/misc/repoconv/ 7092929c41c2613c9bfe74eb8735ae87be9af3a2
Revision: 78350 http://sourceforge.net/p/brlcad/code/78350 Author: starseeker Date: 2021-02-28 00:05:31 + (Sun, 28 Feb 2021) Log Message: --- Add updated version of commit for the missing Mac Hack that puts the proper info in place, named for the SHA1 of the commit it is to replace. Added Paths: --- brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 Added: brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 === --- brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 (rev 0) +++ brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 2021-02-28 00:05:31 UTC (rev 78350) @@ -0,0 +1,12 @@ +commit refs/heads/cjohnson-mac-hack +author Christopher Johnson 625826935 + +committer Phillip Dykstra 625826935 + +data 88 +Chris Johnson's Mac Hack + +svn:revision:3698 +cvs:branch:unlabeled-9.7.1 +cvs:account:phil +from df207709f5474f88155bf37d91a9dd855ad02f53 +deleteall +M 100644 8684ce993e973b87c057cb7bad43a84c71ffe704 libfb/if_X.c Property changes on: brlcad/trunk/misc/repoconv/7092929c41c2613c9bfe74eb8735ae87be9af3a2 ___ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78349] brlcad/trunk/misc/repowork
Revision: 78349
http://sourceforge.net/p/brlcad/code/78349
Author: starseeker
Date: 2021-02-28 00:03:27 + (Sun, 28 Feb 2021)
Log Message:
---
Add the ability to supply a fi file to rewrite an existing commit. If we need
this more need to check its ability to change a tree, but does what's needed
for the immediate purpose.
Modified Paths:
--
brlcad/trunk/misc/repowork/commit.cpp
brlcad/trunk/misc/repowork/repowork.cpp
brlcad/trunk/misc/repowork/repowork.h
Modified: brlcad/trunk/misc/repowork/commit.cpp
===
--- brlcad/trunk/misc/repowork/commit.cpp 2021-02-27 22:09:38 UTC (rev
78348)
+++ brlcad/trunk/misc/repowork/commit.cpp 2021-02-28 00:03:27 UTC (rev
78349)
@@ -456,9 +456,65 @@
return 0;
}
+int
+parse_replace_commit(git_fi_data *fi_data, std::ifstream )
+{
+// First, find the existing commit for this sha1. If we don't
+// have that, we're out of business.
+if (fi_data->sha1_to_mark.find(fi_data->replace_sha1) ==
fi_data->sha1_to_mark.end()) {
+ std::cerr << "Trying to process unknown replacement sha1 " <<
fi_data->replace_sha1 << "\n";
+ return -1;
+}
+int index =
fi_data->mark_to_index[fi_data->sha1_to_mark[fi_data->replace_sha1]];
+git_commit_data = fi_data->commits[index];
+std::map cmdmap;
+// Commit info modification commands
+cmdmap[std::string("author")] = commit_parse_author;
+cmdmap[std::string("commit ")] = commit_parse_commit; // Note - need space
after commit to avoid matching committer!
+cmdmap[std::string("committer")] = commit_parse_committer;
+cmdmap[std::string("data")] = commit_parse_data;
+cmdmap[std::string("encoding")] = commit_parse_encoding;
+cmdmap[std::string("from")] = commit_parse_from;
+cmdmap[std::string("mark")] = commit_parse_mark;
+cmdmap[std::string("merge")] = commit_parse_merge;
+cmdmap[std::string("original-oid")] = commit_parse_original_oid;
+// tree modification commands
+cmdmap[std::string("C ")] = commit_parse_filecopy;
+cmdmap[std::string("D ")] = commit_parse_filedelete;
+cmdmap[std::string("M ")] = commit_parse_filemodify;
+cmdmap[std::string("N ")] = commit_parse_notemodify;
+cmdmap[std::string("R ")] = commit_parse_filerename;
+cmdmap[std::string("deleteall")] = commit_parse_deleteall;
+std::string line;
+size_t offset = infile.tellg();
+int commit_done = 0;
+while (!commit_done && std::getline(infile, line)) {
+
+ commitcmd_t cc = commit_find_cmd(line, cmdmap);
+
+ // If we found a command, process it. Otherwise, we are done
+ // with the commit and need to clean up.
+ if (cc) {
+ //std::cout << "commit line: " << line << "\n";
+ infile.seekg(offset);
+ (*cc)(, infile);
+ offset = infile.tellg();
+ } else {
+ // Whatever was on that line, it's not a commit input.
+ // Reset input to allow the parent routine to deal with
+ // it, and return.
+ infile.seekg(offset);
+ commit_done = 1;
+ }
+}
+
+return 0;
+}
+
+
void
write_op(std::ofstream , git_op *o)
{
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-27 22:09:38 UTC (rev
78348)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-28 00:03:27 UTC (rev
78349)
@@ -1054,12 +1054,59 @@
return 0;
}
+int
+parse_replace_fi_file(git_fi_data *fi_data, std::ifstream )
+{
+std::map cmdmap;
+cmdmap[std::string("alias")] = parse_alias;
+cmdmap[std::string("blob")] = parse_blob;
+cmdmap[std::string("cat-blob")] = parse_cat_blob;
+cmdmap[std::string("checkpoint")] = parse_checkpoint;
+cmdmap[std::string("commit ")] = parse_replace_commit;
+cmdmap[std::string("done")] = parse_done;
+cmdmap[std::string("feature")] = parse_feature;
+cmdmap[std::string("get-mark")] = parse_get_mark;
+cmdmap[std::string("ls")] = parse_ls;
+cmdmap[std::string("option")] = parse_option;
+cmdmap[std::string("progress")] = parse_progress;
+cmdmap[std::string("reset")] = parse_reset;
+cmdmap[std::string("tag")] = parse_tag;
+size_t offset = infile.tellg();
+std::string line;
+std::map::iterator c_it;
+while (std::getline(infile, line)) {
+ // Skip empty lines
+ if (!line.length()) {
+ offset = infile.tellg();
+ continue;
+ }
+
+ gitcmd_t gc = gitit_find_cmd(line, cmdmap);
+ if (!gc) {
+ //std::cerr << "Unsupported command!\n";
+ offset = infile.tellg();
+ continue;
+ }
+
+ // If we found a command, process it
+ //std::cout << "line: " << line << "\n";
+ // some commands have data on the command line - reset seek so the
+ //
[brlcad-commits] SF.net SVN: brlcad:[78348] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78348 http://sourceforge.net/p/brlcad/code/78348 Author: starseeker Date: 2021-02-27 22:09:38 + (Sat, 27 Feb 2021) Log Message: --- Consolidate all the assignments made so far, sort. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-27 22:04:55 UTC (rev 78347) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-27 22:09:38 UTC (rev 78348) @@ -1,149 +1,107 @@ -eb4b12d2baecffdc33a56ba89b29d611395b8f3d;19755 -4aac0a9a29752528a36e4882da812857da5e1c6e;19755 -2788b39fe6de7e5fbfcdc30b9c38e2a15b69bf63;21635 -050bedc3065ed5b051958343bae465c2823ad29e;21635 -0d7ec74a6b6056eafeac1cec2d8f749ac5a2a58f;22217 -f2198bbd3d4008a1c96c8ef754843a3fb3ebc52c;22217 -8e5003746ec73083cb3b297f9b2f75f2e4a5d185;22235 -eb90c0d3de7dab529ae6bd9cc86a8e9e9d605a6f;22235 -d6e81dcd234f945eaa3711017b4375207b57a657;22237 -84aaa63c9d68b0ff2c43b869763892eb5320de57;22238 -423995351c4ae081e1027f73e61adce3762eb47a;22239 -7611c75e2d3c54c03d35970f687f5f36fceff73d;22247 -8810b59008c23ab7e1ac820d4686afa389a29865;22247 -6c3f1d5fe1f4c472dfbcca02203b0d405fffdeee;22253 -d7ab3fc00a10b297b0ad523db1feed88c16625cc;22253 -8350a6a2a319d98911d7d716bb8f649df1a1c09b;22298 -dc581573bb9668a74374d795b2b2aae645f7f455;22298 -e0f1431476622b7f3f359728767a32a6d3736514;22387 -c97825005e7235945182193557cce770bea3eb18;22387 -e5e18d9001190ff7d177bbfcbce47e9f87d34614;22387 -562202b629a5ecb71df28009c12671a6c8c618c6;22388 -a2ea3f23ecc8a5208b8e17594bda741a2efc0d90;22388 -8ab1d383e4ddff5586695436f590e098f179a907;22388 -ecac9050185c26596ed56a6362d2ae4fcc73ae66;22389 -ef0b98c70244d510a74f12d6932d3dadf91c825a;22390 -bea86bb0b7f27a437ec216f472c38351013ce14e;22390 -92c9dd90980d9c423308bbfc5e2b580fb7297299;22391 -4308bde0140e26193670988760c71749d77fa54e;22391 -aeb1621d3ce4e2a897af76f857aa3d6858468493;22391 -d76af6397231abfaa9aa6f4ebd775b5e42a101e0;22391 -df0ed9481aa1fc9b7a41e3ab8edb56bac6e4257f;22391 -f6ad1589e4ee86ea237796c56d1a20eaabcc174f;22391 -8619478e69f04adf07e28a3cb4a6ed6c59559e37;22468 -6c52280f0ce66cb202830a655fa769756b51922b;22468 -4de8eed563b64b2aed0fc99cd26174e56aacd275;22468 -ca509f25f562e6b1d61f591f29c56a134918d9a0;22468 - - -aec4367dafd37a7b0657c4b27414caa21ac4c1be;19033 -7678e03883c0e09c063c6f7fecbaef5db50c4619;19211 -7a6b91272d804146e40be69cf1b197a02b7f9869;19282 -6dc89feeeaad3ab3ffcc6e122698ab51e666201a;19283 -c3d19e5470e3861fc4db59c76f6de465f65fccbd;19288 -70f24c0838458564139cdd749b40ce0777ae6b74;19289 -4d401a8617869d3594b5948de12a374a5bd292fe;19440 -e4c7c2c443b62ca5ab8dbfdd4347724d165c0837;19449 -fa4138d198944ad67f26e77f6552361b87938b1a;19558 -7b4f169aec730a81b5ce863648a8ae31819b97d1;19587 -e9452d6fd0dadb1192d99777acf891b0bc7703bb;19720 -fb7437f02dde3953bb257548c453724ad1af30db;19723 -a378bc31e13250a8a4537f578c41870716614fdf;19772 -48288e65b6a227b30f00dea46073840363b9fc2d;19777 -ead896de7fe9c9f235b720ed5f3bcf6d7877989b;19783 -e2311ccf85cd092b2bac862d142e5ab028b571ed;19797 -86dd96c71327854f7dcd3a4c352446503134120d;19798 -6699b9f0df300c7c7280381e0fbbcf525f9f31e0;19839 - -b7601aa25e8b40f6a0537c96483a29c52c807fa9;849 -e75443d252e4607c696c43e3da0caf641503d5a4;5208 -2c40428b7a1a989174df43b66fd00d9d960487bc;18999 -0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;19184 -86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;19286 -5db99eba906095eb11b3ea893b95301ba9d4;19386 -b11b50a4a522208ece0ca8aa09f493e68184c065;19450 -d9306778a6714c198a0b4385f57a1b7afbd4c3fc;19463 -9db0bcb131b8805c060ef2b35f30433d5f2d16ee;19471 -561e8385b4f2bd30665991d6179e6702fb601cf1;19548 -51a2d8caf35c0512efda85b11bf9a2c858ff0e77;19552 -24d99686c39438784e16e393feeb2c0d4572820a;19601 -4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;19613 -b334467bc02e858e5ad01f18565c740b8458b858;19617 -13c8395e91b708bb045ad34da6bf52459e254287;19618 -71b6b0a21675828fb10df69a83f96988abf0021a;19637 -e974d0e833a02b40de938a22184c06e2ee9e0453;19638 -39b75b2eb605ab9cbe6364622a0bc32ba32f74dd;19652 -13dd9624b6aaf03a26c400c34494320b4223b91f;19669 -023369fd1ba2c63ef2a0fc973ad0283973033946;19672 -f1dc6d42b2b62013b7c83692922962d5a52c302c;19673 -c17ba8ddea5915f8c2c535cf121ff313c2c4d294;19706 -7ec21b4816510812a9a9ca0fd0c712bcfc5527f8;19709 -2b82299887068d18e9eeab288a825dce0603b29c;19724 -03ef287c9f854dcb2c5bad5bdecea2625e7f8bc3;19738 -b963ebd8d5c178f27c322c70b9dfd692f9a71640;19750 -1575b390eaee5f8a22aa24e45879beec0b92f223;19764 -b685aafbfa677f91822bf9fff3566efe28533c84;19771 -81d43f9bd341f538596d0d3622004965864fae12;19773 -7659837e02a36ce3171dd87f8bced3a0a252bbe1;19781 -0e3431831481521fe66ad6b4041a6a9129af2a09;19793 -58f8238edcf9b3846857af71727d0d1bc7e4bec4;19799 -67cde13525c50e995c07c1dfcf0ba1eb447e67b3;19815 -5ce7326cdfa96d00541253cf082735a2bc396b77;19835 -6949221976767b94b98694b73d2b35a12c66933f;19838 -d8f84df3a2b0de48401d529eb3c5085ea3a63bc8;19851
[brlcad-commits] SF.net SVN: brlcad:[78347] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78347 http://sourceforge.net/p/brlcad/code/78347 Author: starseeker Date: 2021-02-27 22:04:55 + (Sat, 27 Feb 2021) Log Message: --- correct svn_rev_updates.txt Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-27 21:43:08 UTC (rev 78346) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-27 22:04:55 UTC (rev 78347) @@ -168,7 +168,6 @@ e262319dc393c1787bbc5d3bf838a4e05408eb79;770 5488e0ac3f46449d3427cc114904293d703d658f;770 1e4e8ca77c749a5a6a0e2a15fd67870935e426b1;776 -90aa4d9a494e4829849ba040ac71b5c6dab317fb;776 b7da866b6bae61d0a00a464a2a1fae3c742be99c;776 625acdb4b0cb75ac095a208dd87616adcf8ca90b;781 be61cb72a094b93557fd73dde08e963c3e1f5490;781 @@ -184,9 +183,6 @@ 4fb135a5692ed5c87297e349e03d29879d6d7176;790 5881a44aa6433fb382a198afc23f7d838111de9e;822 44454cb06e10af77ad298a8e4328368637d93aa5;822 -d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;827 -bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;827 -1c733d8abdc109719c5371801a2db9fc11b103bf;827 8f931991a4c11cc213983fb6c357175cf61b51fc;827 688ec2591a6b6d2ad986a8b4472c2ff18716a278;827 37930d9cad7e191bac25f0a1390798db216aa579;851 @@ -194,7 +190,6 @@ 0a1325cb1f90a31e0fac41fd8481e0157603fa6a;851 26d2feb22e9c0d61d16f86cf93b44149cfb18040;856 86fca9feff61e05e873f9561810a36604d78c248;856 -d7fe528584d1c395556877045949730012b3af57;859 fed24ac96fd966363b16a4d6503b6cd928eca7a0;877 596b3effc765fbc760fe2fae72981ef72830fada;877 7d3b41fcbfe9d1e70d14e13bc0a7ef75ee36b07e;877 @@ -329,7 +324,6 @@ ea694cfff26592aac821f98c636e8b3abd2d6064;2078 1c9b03af3ad93fa71758b05d149397042e29a6c2;2087 78f705765f220518fbd1d500284babffc47698ab;2087 -37cbfbec9e4f1f7c3615925874ef46484427b4bc;2103 349513e737f2252e43c5ea7770f65966b3420569;2161 749386e24bb533640cef711d5e95fe3d1da8785d;2161 709218c406353e438d44463410df8db946e75a87;2167 @@ -337,7 +331,6 @@ 11565647c752e056958771cb8fdae655daa99a43;2176 3842e5a20b1a86b9b4555244795c6e96b5e5ec85;2176 256226eda8b92eb161a97635ad46872ec5f13176;2378 -bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2490 5ab0d7702a12b6c2df138b9cf5412ae31ee7c29a;2494 df117abb5fe9a8511059e61c54f02040e312b980;2494 382ba73a5e2231d12b786a769c18ebacbe5697d7;2624 @@ -345,11 +338,8 @@ 00939ad950fbe3c7b71eb31daa735de58fdba981;2668 397dd7c139007e47098d64b80bd6358473242752;2670 866f14b332c9c433051cdbbee5ef37a74a68655d;2670 -4fdb089a8c1b993ffb4b4347f35e473dd53f0417;2771 694ed283d2d0494efc56ddca2d9aa6cc8e083f39;2851 -abab356c8454dfa57d2dcc5c18bd5f19cb5f2568;2851 d2c4bfdcae40739d15151e61582c883eaa28522b;2851 -4ec44a4d12be89a22b7b5bb56f1636831aafe820;2855 c1aecf1bf48dd957928a8ec9d8f9d23e845172f1;2889 cc9f2c61394acc8949cd3f895ad8f3bdcf21fe44;2889 08ab58969c7fbdb377f1475b252f65b81fb86383;2892 @@ -366,7 +356,6 @@ 0be816c211bce68af88da6045db8672c8aff1c21;3150 8085b25a1e68ce2a2c0e83554c70ad7b905ce23d;3150 3fed3b8c6211e9b55101f6195dd8fad34bcd7d54;3328 -524c15a240f986cafa9963d1fe9a1926873ff836;3328 8e2de03d1a1fe9fa00b6509701668ab9762692f0;3328 06a92fc6f3c667326eeb124608936922a963d224;3639 31a7a8f2677009ecc240aab01267cc0e2f8afe2a;3640 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78346] brlcad/trunk/misc/repoconv
Revision: 78346 http://sourceforge.net/p/brlcad/code/78346 Author: starseeker Date: 2021-02-27 21:43:08 + (Sat, 27 Feb 2021) Log Message: --- Stash a few corrections. Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt brlcad/trunk/misc/repoconv/verify2/NOTES brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-27 20:56:12 UTC (rev 78345) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-27 21:43:08 UTC (rev 78346) @@ -243,3 +243,4 @@ 885ed4c94ec0131f2cba48ffcbb3d0e03e4ecefd:trunk e6417be98f27d570d863744f566f5aaf738abbe6:trunk + Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-27 20:56:12 UTC (rev 78345) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-27 21:43:08 UTC (rev 78346) @@ -95,7 +95,6 @@ e262319dc393c1787bbc5d3bf838a4e05408eb79;770 5488e0ac3f46449d3427cc114904293d703d658f;770 1e4e8ca77c749a5a6a0e2a15fd67870935e426b1;776 -90aa4d9a494e4829849ba040ac71b5c6dab317fb;776 b7da866b6bae61d0a00a464a2a1fae3c742be99c;776 625acdb4b0cb75ac095a208dd87616adcf8ca90b;781 be61cb72a094b93557fd73dde08e963c3e1f5490;781 @@ -111,9 +110,6 @@ 4fb135a5692ed5c87297e349e03d29879d6d7176;790 5881a44aa6433fb382a198afc23f7d838111de9e;822 44454cb06e10af77ad298a8e4328368637d93aa5;822 -d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;827 -bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;827 -1c733d8abdc109719c5371801a2db9fc11b103bf;827 8f931991a4c11cc213983fb6c357175cf61b51fc;827 688ec2591a6b6d2ad986a8b4472c2ff18716a278;827 37930d9cad7e191bac25f0a1390798db216aa579;851 @@ -121,7 +117,6 @@ 0a1325cb1f90a31e0fac41fd8481e0157603fa6a;851 26d2feb22e9c0d61d16f86cf93b44149cfb18040;856 86fca9feff61e05e873f9561810a36604d78c248;856 -d7fe528584d1c395556877045949730012b3af57;859 fed24ac96fd966363b16a4d6503b6cd928eca7a0;877 596b3effc765fbc760fe2fae72981ef72830fada;877 7d3b41fcbfe9d1e70d14e13bc0a7ef75ee36b07e;877 @@ -257,7 +252,6 @@ ea694cfff26592aac821f98c636e8b3abd2d6064;2078 1c9b03af3ad93fa71758b05d149397042e29a6c2;2087 78f705765f220518fbd1d500284babffc47698ab;2087 -37cbfbec9e4f1f7c3615925874ef46484427b4bc;2103 349513e737f2252e43c5ea7770f65966b3420569;2161 749386e24bb533640cef711d5e95fe3d1da8785d;2161 709218c406353e438d44463410df8db946e75a87;2167 @@ -264,15 +258,10 @@ ffc28e340ea504dfc0aa0ea32db78c0792ee7147;2167 11565647c752e056958771cb8fdae655daa99a43;2176 3842e5a20b1a86b9b4555244795c6e96b5e5ec85;2176 -0c1f4a88c5c960bd7de51ef8a05e7f53f00fb1a2;2202 -ead413d02e468224b798f90d71cd6cc833647c2c;2201 73471d15e4bdb81f18e980720fc53a420a6d77ab;2125 -afe83ed0664439285eab1e6b353a8ae1b1d4f42f;2324 -99b0caf44cea6b34855f15e8fec5041e1259cf16;2323 d1a37e90891216f400a4c1bd54868e8af4c88a80;2156 256226eda8b92eb161a97635ad46872ec5f13176;2378 3085d5c46834626221e46d25afadfaebac8f0af8;2379 -bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2490 5ab0d7702a12b6c2df138b9cf5412ae31ee7c29a;2494 df117abb5fe9a8511059e61c54f02040e312b980;2494 382ba73a5e2231d12b786a769c18ebacbe5697d7;2624 @@ -280,11 +269,8 @@ 00939ad950fbe3c7b71eb31daa735de58fdba981;2668 397dd7c139007e47098d64b80bd6358473242752;2670 866f14b332c9c433051cdbbee5ef37a74a68655d;2670 -4fdb089a8c1b993ffb4b4347f35e473dd53f0417;2771 694ed283d2d0494efc56ddca2d9aa6cc8e083f39;2851 -abab356c8454dfa57d2dcc5c18bd5f19cb5f2568;2851 d2c4bfdcae40739d15151e61582c883eaa28522b;2851 -4ec44a4d12be89a22b7b5bb56f1636831aafe820;2855 c1aecf1bf48dd957928a8ec9d8f9d23e845172f1;2889 cc9f2c61394acc8949cd3f895ad8f3bdcf21fe44;2889 08ab58969c7fbdb377f1475b252f65b81fb86383;2892 @@ -301,7 +287,6 @@ 0be816c211bce68af88da6045db8672c8aff1c21;3150 8085b25a1e68ce2a2c0e83554c70ad7b905ce23d;3150 3fed3b8c6211e9b55101f6195dd8fad34bcd7d54;3328 -524c15a240f986cafa9963d1fe9a1926873ff836;3328 8e2de03d1a1fe9fa00b6509701668ab9762692f0;3328 06a92fc6f3c667326eeb124608936922a963d224;3639 31a7a8f2677009ecc240aab01267cc0e2f8afe2a;3640 Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 20:56:12 UTC (rev 78345) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 21:43:08 UTC (rev 78346) @@ -375,7 +375,7 @@ 4c669f50e344427c38c8d377dd07ebf9f780fe83;10453 45b04109944bd66e4b69d9687c602edaab186012;10458 8edc572d574dd93bab5d3cecb9b043306ea290f7;10458 -e78bf1f7a965c3a2dfba1114b376f4baefe9b15e;10588 +e78bf1f7a965c3a2dfba1114b376f4baefe9b15e;10558 a5cd2b0bffebb3f1e30bbcdc269ee22e88d9a971;10561 d72635f15fd536d7466ab93108229bd9e233d391;10561 2b2a7ca70d19ff980762de3de7e3e1874846c152;10561 This was sent by the SourceForge.net collaborative development platform, the world's
[brlcad-commits] SF.net SVN: brlcad:[78345] brlcad/trunk/misc/repoconv/verify2
Revision: 78345 http://sourceforge.net/p/brlcad/code/78345 Author: starseeker Date: 2021-02-27 20:56:12 + (Sat, 27 Feb 2021) Log Message: --- Get most of the remaining unmapped. Skipping a few of the messier branch/merge commits. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-27 16:12:15 UTC (rev 78344) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-27 20:56:12 UTC (rev 78345) @@ -3,9 +3,9 @@ sort -n -t ';' -k2 +Note: d04f31e55b1e5be029173b2c13061d2151034b8b does not seem to have a corresponding SVN commit (Initial version of incrtcl). - Checking into some commit quirks flagged by this logic: 14807 - the commit date and message match 6d6d9077d96b7c851b9d98271aeaa1daeb2b34d2, which is where the Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 16:12:15 UTC (rev 78344) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 20:56:12 UTC (rev 78345) @@ -366,3 +366,229 @@ 3a24758d5aad119d90c0164b1bffc4c5531b25b9;9973 379075629eb9b348f350510aefacb95bbe9b1ee8;9976 e10595ad7f6799e075c66bcb586e7eb83b505e16;10056 +88bf8956f4e05efef4e26af82de04b42de5e1f81;10099 +7496c761e580e1935607fc336ff85bf06c524caf;10209 +a0deda65c03dca64c98cfc01f4dcc7eda755043f;10215 +0b640b6a7534dc1f4bf03555b23888d2ea179ca5;10226 +584c8128df834b5924ea293b1b55dd998c98da11;10427 +52ee34dd890ae6a6217ded698b9f9a72372a6471;10451 +4c669f50e344427c38c8d377dd07ebf9f780fe83;10453 +45b04109944bd66e4b69d9687c602edaab186012;10458 +8edc572d574dd93bab5d3cecb9b043306ea290f7;10458 +e78bf1f7a965c3a2dfba1114b376f4baefe9b15e;10588 +a5cd2b0bffebb3f1e30bbcdc269ee22e88d9a971;10561 +d72635f15fd536d7466ab93108229bd9e233d391;10561 +2b2a7ca70d19ff980762de3de7e3e1874846c152;10561 +5c650d42de2e5c8cbdd5eb27d307447839425afe;10561 +61352884e80611909639630f4b99e42d3155312a;10563 +eb108bac7faf72011f54be3fcb9454123e10a7c7;10967 +bce7fa0f8ebab61ab1cc3b8be4110ab5562fcc9c;10967 +8ac8da3ca82351c6ea6d4ed054c43d7e0c8a63cd;10980 +dd9ccbcfcf2b79ea55294ef950fb2448a938e658;11042 +936d4082399b9e70274f8b7e7f6643299705625b;11053 +d85a9e52ccfdc47487f5dced42ea649000921b17;11053 +06d7addce63eec46a523020aed57ed7d33e8dccd;11053 +99cd898e95d3ed853df4d1dc39fb16fe0ea93eea;11070 +2916f60ea96ebf5d2537ba55ed9bdc8b575666bc;11258 +cfcc24e10b10c8d216efc9a06a2fb7b73454adaf;11258 +641f2839ad79bbfda35373b17e9b70fe9f1a94be;11278 +579a56fbfcb8f5bd5dab9ba1807e387ccb88cb40;11297 +47c8018131d8bb74382cbdeb8123537dd5398f1d;11297 +b47d4a73275b9f1c0763262350c635b0caee78e2;11489 +16e4e698da3d15f88a9331051123d96805297078;11506 +f7d52a1e7d13796b0208e39c73c3691ac15563ff;11506 +a5644d3c6c5fe39a7f3b848cf8cfb56814a23f01;11547 +cf67d8b8085247df448727bbda1594d334e537bb;11616 +8e0d759d81fefafc6bfc986a98f35981d2bf367d;11619 +4ea76ffb417823cd67ffb033b5a23f61974a015a;11630 +0d03a705f7eaeb0525305bd3080dd3da89f139a5;11671 +c9b56425d6421df0b1971ae68048252f7f57e953;11716 +1359355454fc3b1c86aaec2856518c6f4ae43cea;11742 +bbe0d0f5610a6f1eac13094580df46383339ebde;11742 +cbdfb1cbb3e368a7dd8bf74a1e73c9ebd24debcd;11742 +1887b848d98784c203563ac02cb6d5be9407b503;11810 +4a6fb949ed766727bc511e8cb4726de950692b6b;11822 +2dc2675032ee293dce38c72320716f2b6ac0e554;11822 +0e02dcd9cb00a1b829ea10ac28dcebaaebea4d36;11863 +bce8f27980398ae9510ccebfcb0056ac9677361e;11942 +98a718029e8a6934bb5b04a3ee28f16190f5905f;12030 +1bb2b25e434858afa8b464f32483c1d2114d2b96;12140 +43234fc61dc59e10b0e242ae52b256d854c2dd1e;12140 +6008c342975ee1d7928970f49ec2ab55546501e3;12219 +f889d4d8c70e96d66a84a75f7195e47d7dba6c99;12288 +0928da4b0ad01308e1f657ac46361d03d4c02e6b;12320 +25e1f7ec7daaf863693807730314c1fb91a7a5fb;12349 +7939a34d2d3c1eb6a4cf98b14457a25fa3331bb8;12349 +84bfda629bad8157571d17143ef01ee9b2ed3417;12349 +6cf78461e4068fc518f51fcdca7ca382cff133fe;12349 +198c422f790db7cc2bf89e2a00481e394e189b32;12349 +699551b5196e95e434d54685a5bce8a046db9dea;12353 +b35f03731383da58f41fe7a40ce4b1c30a7300e2;12357 +4625d0da8c5699f08438c493f588491240522efa;12357 +20263304677d78cc54e968d7cfcd8fc788cb0f58;12357 +200556445c5c0e7f138c95bc2d7bb32b06bb9f4f;12357 +1674303962947ca48a2121de2819bccb37ee5f9b;12357 +d2116d73d10c526519bbd91a4406fcdcc58db4be;12357 +3f77efc38dc059670475b28c9f21015ee03c5ea1;12357 +f51c607581bedc55bf7901dc127cba33d337bb26;12357 +8fe68bfaff105ddbe0792b5332ac93044d802601;12357 +c7dc2b07d07adddf7e363a611aafe17af6c56dce;12357 +b80af76a690c37b03dbc55822ba62ec575d742d3;12357 +d131cf47d3d0bda6f5d201a882c83a416655920b;12357 +b4ac11ce4afba6bdbc35832fde4346786cb96985;12512 +b4ac11ce4afba6bdbc35832fde4346786cb96985;12512 +71ddd33f066bfe5ff55f081a19dc10292e071291;12512
[brlcad-commits] SF.net SVN: brlcad:[78344] brlcad/trunk/misc/repoconv/verify2/ hand_mapped.txt
Revision: 78344 http://sourceforge.net/p/brlcad/code/78344 Author: starseeker Date: 2021-02-27 16:12:15 + (Sat, 27 Feb 2021) Log Message: --- checkpoint Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 03:09:19 UTC (rev 78343) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 16:12:15 UTC (rev 78344) @@ -227,3 +227,142 @@ ea4d6e07fef9433a337eca7cfb584d2929a4a13f;5979 7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6345 837f243e290d6b4870e59c545a405c9fee71027e;6441 +db7d89e8dea67d9a3dda6b2d33425185154f3b1d;6478 +e847ab502326201f7e47fd50d81d227653737831;6478 +fe4283b0f7ad47c2ebc8da2c4a47c52ac1c49f7d;6486 +49af06eed009659362295191f220321382f210ed;6486 +2e715e80a73f27667f52fdac3c7dab24bfac33d9;6490 + +87240aae24f5b63e0e7b0677bba711a491a41c36;6627 +1e12763a7116cee063635c3c357fda8e02e0b901;6627 +72828195c8e1c1cb5b54e0baa552c3176787e0b4;6627 +f656ce7d35ef0797aac8cd8eba1fc19698ff9145;6627 + +1bef32e987cd79f689f63fc0e259f831ef158ea3;6632 +2c248235f81d2d8985150c7d34393a21d3bf35c0;6649 +5236eb0074469ebd340738d9dccf85b26fef950b;6649 +d018e4c10166abf8a21854e0a72cc7cd17169c81;6649 +1da5a6684428d3471d83bc0043b7d739c13380ac;6723 +12985dd815e66d019a31f825e83824363ae0df05;6724 +9fa89d321da34e9df7e474fc8291e0b1cec8be31;6724 +aa31e73f004442d88227fb8e6bae819208ed5b2c;6724 +bdbe18679a716ce4c7fd6c343cd477607cfc4979;6769 +4aecdb26459ae9822b9ed22afb7f3b658e55e534;6881 +d9afce1e12111eb629abda12de77f0dd04de91c0;6881 +44d934d36f15bf4fbdef3d5aa17fd08cd1a79050;6881 +a0e097b5097a888247329c97fa9c1da94f0d6f97;6881 +bb2e89ef02a592c60ee7c2443426f58f43d21365;6911 +5f0d406aec5f919ae44875a6841cddd62229cef4;7013 +3ab0d8d37ef6de9218cc5cf099a07e6b8d143d1b;7056 +fbaeac90122b70756d50d787bfd471b86cb0974b;7056 +17c4843e157c027d20842177223284d50476e8d7;7056 +6211b8ccf8101af7c1fc945e7b597497cc0799fa;7056 +67fe13d9904392c401c9c0a8b6a39e7c3107ff1e;7056 +03e4d222f97242da413bca8ca04b5e72dfacb4c9;7056 +95c067b832ec49d7314a5caf076861bcb4731cf8;7056 +553b324109ebc1d5c86138e62d95531900253300;7056 +9d3b7acd5d290ee8548de3c5daf3394363e81c12;7056 +3d08c38216cc4d79ecd4049e68e0d11e0fe0e6fe;7064 +2be836c127f2afc8346a5e6faf623d11aab5646d;7064 +8ba264614772a5a0996e900c09e5e630163790cb;7064 +a5ac5ea41f2c07950d97fe037f8d5303c6472d44;7066 +91abdbe7b16f5de49cb37eccb416bad9618ffba9;7066 +8d8dd047046a58bd215ead7f089eda50d6b62683;7066 +df12af0b787d7ad1ccb72e1afd85a22ad71e26d3;7066 +68ff3eb51e85c1208ae4d0d37b338f7c1d001422;7066 +6ab3940e98bba5c36fe05c995d578df7e423cf0d;7132 +e5708dea0741dfa903f28fb5b2b1c61cb92ce66b;7132 +5d3cc78ee218b015d7b2d401e502093bce66;7132 +ff982ee064bc63d06950301e5e50df4bc3bf5074;7132 +48c16d3a341ccab510b171f1208f78c8ddb4756b;7132 +510301d89d85162063d6e3b0a6746bc2c2c95628;7157 +f96fead8e5562d4aa97623e735fb8e1da722fd7c;7157 +497a2ed406f2b2ca159d07094322e9e3bba25314;7187 +753a97533daa051d6fb654cc345b33c5435535d3;7187 +8a4c668ee1802f9b68dc6635da211a2eca9490df;7326 +ed11aea0f24e03a55395a0df8dfda8505cd0871d;7587 +9d33421a9337a1c692f060f5947134f5d72fa0bb;7600 +fb0c3bea5b432d851c67d59a27cde9f5b040c109;7600 +db2fbb22f65556e7df54d8b03f24e8c70aed9480;7614 +b182dd90087c4fe4ab91a14c515f4a9741697957;7614 +bac4af9ceb45c1d9c769e9bce218b77144a78748;7614 +a3a83b0f618289abc220fab7eec4fe58cf06ea9a;7715 +d0dbfeb9a94bcc2052d82ed9ab886825941f4e8b;7715 +f7f1a3c29eb098ec4697b7489c859f138c352f37;7807 +5c810de8fb3690151e8e49ca07cfb0b23ac5c8f1;7813 +ae2c7e297238bf50660e86878d74b9744830df14;7813 +856b81be547d37bcf950b47029fc07d35fac3370;7936 +dd5e1c8fdb4ba26a31b938e021785cd147053d72;7936 +6c6fc7d529b185a21f745e87d61119743f020e2d;8062 +400dab1d75cd75b7b7718c3cecea9a729faef3be;8062 +dd484ba3e4ef2d21cf333f549bce8ec824c0bf01;8090 +92ef2eac69653eff5565cff31dbc9212472786d8;8166 +4151dec64c81b8254b3b2d06a02138791ee67eaa;8625 +84f852f631de2f70dbe1240818e909eebccd3f20;8628 +680ed5f55760a7c6768491af8a78d4046cec847d;8815 +504efa94e18a486e8ee3cf32d6e14d28165fd869;8815 +b8dd048a1705bd234e8f82e5883db89cdc6a5b76;8863 +10a09bd1d95624b01122820d33ac7c66fdf192db;8864 +69468c08373fdce99ca1a7cfe1a62afbed78c0b8;8866 +778c95d1c5c2da1f1823586987077c8839ee8ea5;8867 +c7e036663315d6a6f428877ce63aafbaee2e3ab8;8871 +fc25bd68060f3eb30359eee6ec1d8392534166f9;8872 +bb5128c26ecedca862a7379f0fe07200e954bae9;8873 +b4ef3c1aa4fc9865285fd5af4a7d53c043cda423;8874 +985504b6a131735cc4a246b83b89305b590afa03;8875 +46e6213d4e91a7744c38a66674ad112cffc4aca6;8876 +b497b720599b9e7274d8c786013753c73543eb6d;8877 +ffb390283f60a0d8a30373e756159dfcbab675d7;8894 +e5634e338604c901c762b025a936bfa9e7c9d1a0;8901 +d2bfffa748e7789c3458c3ca731d4973cddefcc7;8903 +8d19f2b59983b4ada13f9c9c4460c6d5f6a7c4f1;8903 +ae4c461cc9aa8cbe0278921a4e1852ee188e5499;8904 +e5c18b9770ef1222ed1ee4fdc02ae1d248c47e91;8904 +8a3491626463e09c7abb6758b349e331263ef24a;8922
[brlcad-commits] SF.net SVN: brlcad:[78343] brlcad/trunk/misc/repoconv/verify2/ hand_mapped.txt
Revision: 78343 http://sourceforge.net/p/brlcad/code/78343 Author: starseeker Date: 2021-02-27 03:09:19 + (Sat, 27 Feb 2021) Log Message: --- checkpoint Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 02:39:09 UTC (rev 78342) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 03:09:19 UTC (rev 78343) @@ -175,4 +175,55 @@ 2545d8dba6823921ded4e44cec935a744cfb86e4;4698 3a9fe3ca74dd50c55b6102bc40eb1c5683044711;4702 ea67b6b0a11a9f6aa405af1a85c85a3204ed3cf7;4891 +8f15ff80eb5e949c4b4eb1581843d35489560f38;4921 +8ef313245ffbc74f554deadec598ff6dc6beb83e;4921 +3a7911d9f50e8aa847aacb85fa1e6da86229cf9b;4931 +6157a0c33c5565aee6588d99bebb2e27be60333b;5074 +8cfaf3363a0644a7904e4d3a09da7978e94630bb;5141 +0f497f84e18587fb302d1d6e65100d0bc7bb259e;5192 +465f35fc9553bb74f03730d2f06f06469eafbf78;5197 +09a774da0ead526eab11dbc5319e1335268f45a6;5208 +fe3c685f1ea99964fc9d96ed81488d5642c870a8;5422 +16d9b666d0742c8cb9fbb33a2fa029ac9cc77b91;5446 +3e8af32e1d3789b0a3d042b36281814fcef4563c;5446 +18ed8eb1b26d9a2599bac6efd49590a21e8b2b29;5446 +f9a96497f3b62b7d29291ace16c09edf3100911a;5446 +ae7ef68ef0303773a2ce4dd5ea6b459235d8f96c;5446 +0a6407bf0c3af4bdf1f51caa7bf97ce7196e0e69;5446 +5767e2687981d10f4f164d345e9cd4644859d2b2;5446 +003b03f78fdcc5ad51267fe132798f42860de523;5446 +ba93cf7a42909911dbce2eeb3e66157caf8af3eb;5446 +3fa3e5dce1379eb510efbd80462d5e3e14347bc8;5446 +bf55f95353ed4819fb9f47874e73f62affde7b3d;5446 +c7091438885b257c87b4f07da3afa34740206199;5446 +910c408e528e6f7a6f7d71268fdd1350bdc84438;5446 +cbc0a806d3c2eb05e889fc8daa313f5a33521430;5446 +5def87cbeb0abcf95be1d6bb35dd6fbb125fff25;5446 +c122eb15e86c97db2f50f0238e09cf11efb87f27;5446 +ad6490cab56d5e52cd5b601ae61edb4df09a0482;5446 +840e6c3bd564d120984ce172cd335db1a0b15f97;5446 + +f0e797e17ea0d0545e860e7abf557ad672b4e4a2;5519 +8690645300eb7e51e9f56a5dd70330dc049c0d2a;5519 +ab64d80aefed88468c2b2465b0ad2afeabe221d4;5519 +0191686b314fff22b845b2e50aa4f8399d5a38b2;5545 +2133f4571bb06263c75a8385b08206ec022f5de3;5631 +cdda2e9d63ab91d4c79f0a47480a5f0655db371f;5631 +d2dc6a43986c1a871b064abeb98fae8dfa32a8b4;5667 +feaaf0a5e4e2560f85f19a16db713b0bcf6518fa;5734 +ffceec8a7e4227042b531285d419b96b500e5ebf;5734 +cdceaacbbe9b8fa7f88ce3bff1294a7e846d457b;5781 +d00e09d02b306762929245134d62fbad364d8feb;5808 +26653c9b25bff664471fba3782813bb11df8add6;5905 +0950b3f6d7a54f2fe126ddcb38291727adcfe176;5907 +fcce07977613478754683cc8973080b5ccb168fe;5907 +1602f5592d7602cbcbe430887b29ad28d7d78fdb;5907 +6a28f149285c443d7c5f2d4626de152a4b5a319f;5907 +7c6de173a980da19a62d4359c26857ed8b6f73d0;5920 +95e21e8c4d4ad682fb3b2dc6c98100386ac66d7a;5920 +bdff1bc94373305929b1b6398d0d8f949e55e2a3;5920 +4b144b962aab908af92bde958a2756825cbb4762;5979 +ea4d6e07fef9433a337eca7cfb584d2929a4a13f;5979 +7a3d1ad6dfc848a1b9fbc771652b517d3b8c9972;6345 +837f243e290d6b4870e59c545a405c9fee71027e;6441 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78342] brlcad/trunk/misc/repoconv/verify2/ hand_mapped.txt
Revision: 78342 http://sourceforge.net/p/brlcad/code/78342 Author: starseeker Date: 2021-02-27 02:39:09 + (Sat, 27 Feb 2021) Log Message: --- Checkpoint. r3698 (Mac Hack) will take special handling, since its commit metadata are all wrong in the original sync commit. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:45:08 UTC (rev 78341) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-27 02:39:09 UTC (rev 78342) @@ -137,3 +137,42 @@ d26a41cd13c73d6b10300f2b0481fa0c5ab07628;2487 bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2489 0479a94c3fbbad7abbd9c0f58d0c86d28c523f40;1560 + +a9d190f94827ee228f5032697033fddfd536fe33;2668 +55cb3fc0274c010c0d9b9d693a1b0cea612da14a;2785 + +c8c0d03315ec841afdd22f017dadd238b909c10a;3039 +5afc1c514638336700f163dacd63885557122748;3039 +c2cc13991e3671730a828c7041772993d838695a;3039 +eec96cfadde20486e7f8656d7bb9b2c39ea85cc6;3039 +96c4f80011381a6e609ac6f9bae491978c161630;3039 + +e4b80f631e291bef42dec688d267d42ff9c06891;3639 +ad0ab78ba0ff1245f29325dce7d023941127c731;3639 +65c7c093d88c10fde81efa45111da7251d0fc5cb;3639 +7bf0316295c7a6d6e622806e860ee549419af610;3639 +2a0e860c2d3414f8038782ba58269fbc74cc0c77;3639 + +79f81ff3a3bbb8beb5bd99c9fb8bc5e3d269c3c5;3755 +e418a2c12cf4ebffd9a3f33c0253cc21f2a72663;3755 +653be2ac76e7b022ebef11e76d8b533432ca25ff;3755 +ee5000727639e68b6ec6cca8c71891f2c6cbeb7d;3755 +68a14b19922196ceff4ff2f0a902e83026f83e21;3755 +e71c11290acdb3672377b0da50941128b918eebe;3755 +d689f9fab8742a85531dcfa306408e59c5bc66bd;3755 + +fa07c8daf23dd6fd740322f31e37bdaf5084b5ae;3850 +0864f161fee4baff1f39c154c370dcb9db051819;4017 +0fe95e56d65047d8505c9e86b5f3dcdfcba5d092;4017 +bec6f12a0ff0d2a25e7aaf84ba55b267efeb050f;4077 +79873557412c5b003816ef35c6b4aeb0aad72baf;4323 +6510d5c52356b1a2a8069220e06857f4102689e6;4524 +e5fa95d172ba7f4d329f76738dcd1babc1c663ab;4524 +554620ca9d355a412f8c7de2e312ac5165039dd2;4524 +de26c5f2e7931e087c624b5451610d40dd1fc7ec;4669 +0ecb586939e7cb921c3a78d5708d7bc5e8df13a8;4669 +59209a25026cc7ffdfd9bc5c9e20b05d536c8a59;4698 +2545d8dba6823921ded4e44cec935a744cfb86e4;4698 +3a9fe3ca74dd50c55b6102bc40eb1c5683044711;4702 +ea67b6b0a11a9f6aa405af1a85c85a3204ed3cf7;4891 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78341] brlcad/trunk/misc/repoconv
Revision: 78341 http://sourceforge.net/p/brlcad/code/78341 Author: starseeker Date: 2021-02-26 19:45:08 + (Fri, 26 Feb 2021) Log Message: --- Sort out Release 2.3, insofar as empty diffs allow. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/NOTES brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:34:10 UTC (rev 78340) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:45:08 UTC (rev 78341) @@ -338,7 +338,6 @@ 3842e5a20b1a86b9b4555244795c6e96b5e5ec85;2176 256226eda8b92eb161a97635ad46872ec5f13176;2378 bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2490 -ad552d164ba70a3f9d8901aeab24a701577cc7e0;2485 5ab0d7702a12b6c2df138b9cf5412ae31ee7c29a;2494 df117abb5fe9a8511059e61c54f02040e312b980;2494 382ba73a5e2231d12b786a769c18ebacbe5697d7;2624 @@ -604,7 +603,6 @@ a2f1a3696b07e9026806ad15c3d43617905c1503;2327 7f2b46e0c4916a96877e885676851643ec211c62;2336 a922a5e2d2dc42d1b65e7a1b1ebae693b140c288;2443 -ad552d164ba70a3f9d8901aeab24a701577cc7e0;2487 6b49de46806902020173ee95212c00471e2d0f6b;2506 6beb05204f8c8580b61b0912caceb75a7ab14915;2507 12fdb38430d7ce2bb6e0a6cd7b248eed0d5bf7f8;2652 @@ -735,7 +733,6 @@ 420b6c86aebaab8d233b9124aac2dfcaab390158;2253 3626fd67e335d89391ce624b8a3246bd99adffec;2470 231fd989a63e842f6ed485d8ac49caec4eee3660;2471 -bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2489 1a79a71444aa3900b25c61c321c270d3f83d7065;2657 0857eeb72eb573cad76f86b770e765349a85a671;2875 b026f5c0fe0aa8e2d9ca34051a20fb9afb92162a;2884 Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-26 19:34:10 UTC (rev 78340) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-26 19:45:08 UTC (rev 78341) @@ -273,7 +273,6 @@ 256226eda8b92eb161a97635ad46872ec5f13176;2378 3085d5c46834626221e46d25afadfaebac8f0af8;2379 bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2490 -ad552d164ba70a3f9d8901aeab24a701577cc7e0;2485 5ab0d7702a12b6c2df138b9cf5412ae31ee7c29a;2494 df117abb5fe9a8511059e61c54f02040e312b980;2494 382ba73a5e2231d12b786a769c18ebacbe5697d7;2624 @@ -542,7 +541,6 @@ a2f1a3696b07e9026806ad15c3d43617905c1503;2327 7f2b46e0c4916a96877e885676851643ec211c62;2336 a922a5e2d2dc42d1b65e7a1b1ebae693b140c288;2443 -ad552d164ba70a3f9d8901aeab24a701577cc7e0;2487 6b49de46806902020173ee95212c00471e2d0f6b;2506 6beb05204f8c8580b61b0912caceb75a7ab14915;2507 12fdb38430d7ce2bb6e0a6cd7b248eed0d5bf7f8;2652 @@ -677,7 +675,6 @@ 420b6c86aebaab8d233b9124aac2dfcaab390158;2253 3626fd67e335d89391ce624b8a3246bd99adffec;2470 231fd989a63e842f6ed485d8ac49caec4eee3660;2471 -bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2489 1a79a71444aa3900b25c61c321c270d3f83d7065;2657 0857eeb72eb573cad76f86b770e765349a85a671;2875 b026f5c0fe0aa8e2d9ca34051a20fb9afb92162a;2884 Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:34:10 UTC (rev 78340) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:45:08 UTC (rev 78341) @@ -121,5 +121,19 @@ 99b0caf44cea6b34855f15e8fec5041e1259cf16;2156 afe83ed0664439285eab1e6b353a8ae1b1d4f42f;2156 +7a84528b9dea088ba5d11e3dc44253067a7935a1;2378 +1399705608569f244bc7ae8f2690a25bc588672d;2378 +d0e70965fc4a50a14c0ac5ee4edcf914403a0dfc;2378 +4ab1cc49d2f9b609cabb463fa2481cf8a0ea7701;2378 +408fa32e5a53d230914618254a033fe9e50419c0;2378 - +5a28d94fbb54ca67f2d0e78e4be808a8f3d058e9;2485 +c79d1b2ccd0a33bb9b07fc7ed6696b0eace7a2aa;2485 +e6f62fd2447945302ccffa359de62a86885c59f8;2485 +396ca751d121e38f6f6199d19f7d5c2ac661cad0;2487 +bf32a7d39a6a52e3ec34e45b5cb42ff78d91efcd;2487 +9beadcf34aee1d55d3e4d7048c6f7e8c408e8058;2487 +ad552d164ba70a3f9d8901aeab24a701577cc7e0;2487 +d26a41cd13c73d6b10300f2b0481fa0c5ab07628;2487 +bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2489 +0479a94c3fbbad7abbd9c0f58d0c86d28c523f40;1560 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78340] brlcad/trunk/misc/repoconv
Revision: 78340 http://sourceforge.net/p/brlcad/code/78340 Author: starseeker Date: 2021-02-26 19:34:10 + (Fri, 26 Feb 2021) Log Message: --- Similar sorting for Rel 1.24, although bit iffy on 2324 assignments since git diffs were empty. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:24:14 UTC (rev 78339) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:34:10 UTC (rev 78340) @@ -336,9 +336,6 @@ ffc28e340ea504dfc0aa0ea32db78c0792ee7147;2167 11565647c752e056958771cb8fdae655daa99a43;2176 3842e5a20b1a86b9b4555244795c6e96b5e5ec85;2176 -afe83ed0664439285eab1e6b353a8ae1b1d4f42f;2324 -99b0caf44cea6b34855f15e8fec5041e1259cf16;2323 -d1a37e90891216f400a4c1bd54868e8af4c88a80;2156 256226eda8b92eb161a97635ad46872ec5f13176;2378 bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2490 ad552d164ba70a3f9d8901aeab24a701577cc7e0;2485 Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:24:14 UTC (rev 78339) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:34:10 UTC (rev 78340) @@ -111,5 +111,15 @@ ead413d02e468224b798f90d71cd6cc833647c2c;2125 0c1f4a88c5c960bd7de51ef8a05e7f53f00fb1a2;2125 +a56709c5b34ccee83865846c6537b520e451dfc1;2323 +221eecb1b9f0f5d8ab18eabc460f768b46845a04;2323 +4e3176d6051918ac3267e6624f3fb3a5fa16bf87;2323 +4b7fb1d0bcb47269564725a52eb6d8ed67eb89ec;2324 +ba29664ad729dca912a42c009d67b788cde2;2324 +a8ff19d9f34c233b6905d21a993916fd5cc732b9;2324 +d1a37e90891216f400a4c1bd54868e8af4c88a80;2156 +99b0caf44cea6b34855f15e8fec5041e1259cf16;2156 +afe83ed0664439285eab1e6b353a8ae1b1d4f42f;2156 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78339] brlcad/trunk/misc/repoconv
Revision: 78339 http://sourceforge.net/p/brlcad/code/78339 Author: starseeker Date: 2021-02-26 19:24:14 + (Fri, 26 Feb 2021) Log Message: --- Sorted out the Release 1.20 commit mess in more detail - 4 SVN commits mapping to a dozen git commits. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:04:27 UTC (rev 78338) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:24:14 UTC (rev 78339) @@ -336,9 +336,6 @@ ffc28e340ea504dfc0aa0ea32db78c0792ee7147;2167 11565647c752e056958771cb8fdae655daa99a43;2176 3842e5a20b1a86b9b4555244795c6e96b5e5ec85;2176 -0c1f4a88c5c960bd7de51ef8a05e7f53f00fb1a2;2202 -ead413d02e468224b798f90d71cd6cc833647c2c;2201 -73471d15e4bdb81f18e980720fc53a420a6d77ab;2125 afe83ed0664439285eab1e6b353a8ae1b1d4f42f;2324 99b0caf44cea6b34855f15e8fec5041e1259cf16;2323 d1a37e90891216f400a4c1bd54868e8af4c88a80;2156 Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:04:27 UTC (rev 78338) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:24:14 UTC (rev 78339) @@ -91,5 +91,25 @@ 1b655250ee0f2aa96a98620afeb4797d3b1a5387;1003 19922a2a0fa986fb24be136c5e86ea6f7a645782;1079 0a92dc9ea3d62ed3e73bcaf4d5d133522594cbf4;1132 +ce4fe23c14ee15fcda67d818ba5f78f2dc80bb6d;1175 +38555946bffa148230e8ba0ca75e4305e574093e;1238 +908505f8729b4ff7668d91680abc5a70f9c051e1;2185 +607c2b5e3a6a5270778c40266ab7ea3d7e49affc;2185 +ec2350e47ab0a7a6a2e4f798aaf3a348775077ef;2185 +6ae14458f214924da4a66e950543b3f5d03b1871;2185 +ea7fc478dec11a5baeae222e21f155bb96b6d9cc;1438 +5761aea5f6d2a0477b608834ed51df7a275748b7;2201 +c7fd7f66783095cd68afb1cd5883fd50114a0a9e;2201 +97b9bfa583371d50e0b01ed5baf2b62147702ac5;2201 +4693113c1001d4d9d9d753690d3beb89e884a452;2202 +b55114443427973adcc187200ac9289d73c3991d;2202 +3540105f0c2836d4111f5fc031e595eede1f60aa;2202 +98c65896c973e957249e875f32439460a1f9d39d;2202 +b6905eaf78b19ff9ff69662a9cf5f7f0f71bd74f;2125 +73471d15e4bdb81f18e980720fc53a420a6d77ab;2125 +ead413d02e468224b798f90d71cd6cc833647c2c;2125 +0c1f4a88c5c960bd7de51ef8a05e7f53f00fb1a2;2125 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78338] brlcad/trunk/misc/repoconv
Revision: 78338 http://sourceforge.net/p/brlcad/code/78338 Author: starseeker Date: 2021-02-26 19:04:27 + (Fri, 26 Feb 2021) Log Message: --- Sean figured out 1107748 - it's the previous commit on a branch. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 18:42:42 UTC (rev 78337) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 19:04:27 UTC (rev 78338) @@ -132,7 +132,7 @@ f5a1b0037fec2927cba073d118db24cdbd681975; a098425430db227021617976961e6b51ce5569cb; e6417be98f27d570d863744f566f5aaf738abbe6; -11077485329842c81213eab68006fe5d58b5925f; +11077485329842c81213eab68006fe5d58b5925f;21564 67c46ada661fdab789632885c34bf77a277962db;18892 @@ -754,6 +754,7 @@ 55cb3fc0274c010c0d9b9d693a1b0cea612da14a;2785 + aec96edb58d9409d7c7eaa6017c376838f740fb8;21901 04f18f0fe5fce3dbc5009026b3db8bb0a51b378d;22236 0f8b6df62894be583f65f68301ee6c7a21392132;22240 Modified: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 18:42:42 UTC (rev 78337) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 19:04:27 UTC (rev 78338) @@ -88,5 +88,8 @@ 50270091ce303f94e5474fcb5324fd453f37a9d9;930 aabc7a48453139ccddebc5558af74f760b5fb7cf;930 ca8eebeff0757ea56cbc1a6accedf7f8897dbb1b;958 +1b655250ee0f2aa96a98620afeb4797d3b1a5387;1003 +19922a2a0fa986fb24be136c5e86ea6f7a645782;1079 +0a92dc9ea3d62ed3e73bcaf4d5d133522594cbf4;1132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78337] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78337 http://sourceforge.net/p/brlcad/code/78337 Author: starseeker Date: 2021-02-26 18:42:42 + (Fri, 26 Feb 2021) Log Message: --- Sean's logic spotted r2785 Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 18:38:01 UTC (rev 78336) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 18:42:42 UTC (rev 78337) @@ -752,6 +752,8 @@ b79938e73904554259dd66843aba3c093c17a831;19658 +55cb3fc0274c010c0d9b9d693a1b0cea612da14a;2785 + aec96edb58d9409d7c7eaa6017c376838f740fb8;21901 04f18f0fe5fce3dbc5009026b3db8bb0a51b378d;22236 0f8b6df62894be583f65f68301ee6c7a21392132;22240 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78336] brlcad/trunk/misc/repoconv/verify2/ hand_mapped.txt
Revision: 78336 http://sourceforge.net/p/brlcad/code/78336 Author: starseeker Date: 2021-02-26 18:38:01 + (Fri, 26 Feb 2021) Log Message: --- Not sure if this is going to be practical, but start hand-mapping the 600+ Git commits not otherwise mapped to SVN commits. So far they seem to be 'pieces' of SVN commits so identifying the corresponding SVN revision they were 'broken out' from. Added Paths: --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt Added: brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt === --- brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt (rev 0) +++ brlcad/trunk/misc/repoconv/verify2/hand_mapped.txt 2021-02-26 18:38:01 UTC (rev 78336) @@ -0,0 +1,92 @@ +97e7d81928dccb79a3d0424ab279a93f60b3a90c;11 +6eb5361f8a71607180b7481a559c8738896a796c;11 +25e98524ec59558eb60ffe948f94d0fcc47e01ce;11 +0754c7bffb0fb9f2e9c9ff83b4a0e0901ca41d60;11 +8f7d98c9fc3eae17a243e69304fc30dcf3cf0a2e;11 +182ad44b135260562999a6c43e7260fb3cefa776;11 +3af1b3b31a08d63c777bc6ebc1a726115221425e;11 +a098ec0327795e45fef468f3c64271bcc21c2c8e;15 +f10248222525acc3aa9271dccb8889089b1dc7b3;49 +9830d1d64d817e504c3158bc8f1a4673f3f54180;91 +a32b32e02f05f19313a34c3feff560432a9a0e33;91 +ad639df62a1c8f71d22b31395a918242f80ea704;91 +64fb8068e8766a79a367d8da568f1c223ba999eb;91 +59e8d8b3d8680be2280eb768032379250f5c25ce;91 +59c207a0711896cad7e94709602d13883d791ce4;91 +58268608f81051d1988ee14585d66afd186d683e;91 +505cad9155ea91bdb7b900a8c9550be48cb415c0;91 +7cb23d99cc9b150a7806a259501c107e132a7b7e;91 +289169eb236ef2904ef1dc16687e7ef7989a1617;91 +7419e69b1a5056347bd7b05da3c993cf40a12efd;91 +1679baa73e7f0eb4d882bbe6c6c55e4e909b170d;91 +2722d622a29c668bf602255c68a39678ff19ba7c;91 +4181ded5e67e24f35abef20262ed6ab2a29930f1;91 +a0f5f97c604950f6dcfb6b2212a47a5b4e05af1f;91 +de43b627fabc592beb6c8fc85edaddd2156f;91 +db56d2a767136a8f7633b7f19b3556517b27e44e;91 +5466b971e4f62bef4905fd751599597c1277227a;91 +8bf126234b5ef8e0a112f2d4e4014a1a6c764136;91 +9c70b7794928b304f0c681944c956206e579c6fa;91 +fe2ed019e29e3bbae3a071a6d584a332d545b615;91 +5615818dddf83c17485913ec46efc9b89a81641e;91 +fd8babe28f66e3a96b546c1317dd3e959fd9eb9d;91 +b0033c11da3ec1947b91a9f709d13a606ed78735;91 +8452d47375c4822321ef3e186383475d10121490;91 +5d8dfc94a057477ef506c8ebf21008a84afe66e6;91 +bad6aea8330ea41a8701974758d6cab365270d3f;91 +a8b6574ef889915a12df428312e87d2d52d88757;91 +47595151d09d4a52c287d03546d2d2443d591a74;91 +39275c10acda31357e6d2d392a89513a0b2d0e10;91 +ed8938c786dad64529057d6e48655ddfda569bd6;103 +2d5d1f2bb03342b0d7cbb63741d9a149bd5bdd9a;131 +0b8e58cf9bdf4fc4176a5d8529b9ed03b0f1e01b;139 +a6030788faffd9f28dd8a619a527217cb3631dd2;256 +cad8629fd4b7c7167f598b1f4713a284d2fd9c3b;259 +10891054d72e8a9c71ae0d409cf41ab73fdeebbb;259 +d7c39260349cf7e4aadaa0bb1aa14c779bc85d2e;270 +7705f04f59b0a63da331ffe7430449332f972ab7;276 +906457353e90844830124aa4a9f08225448b3dd0;290 +9036ef90404e0b9dd5f141146f96b17f2d3fed46;305 +80b0b6f97cdbe3ba9065d39b92fa9122b66837bc;335 +3a6356c8d35e669a3b286b4ee75acf9ee3380dad;384 +c24694f071cd62e20caba4ebf54503e61af164e8;395 +b609d360699c67f028bcc088d9ac2bac22a6c898;493 +b547003813352fbbbe2914adfa1d0f86ee118e07;493 +65fe5dcf39e51bc8c02d4a33c5e6bdc1a310151d;493 +8d56b421e2f846e8b3dc7a5f989a3015458d45a3;527 +961cbc9a60999ef176301319892ccce0ebeb3850;527 +47dbef390d420864e0eb4c61bcb0b7d9db0d3201;527 +73dc291ec459e37ce2c9aa2807c1d6065958a88d;527 +f22d53a5d76436d711e4dd76667f01886bcbafa8;552 +5b9eb3d4f97689deca7cb1dcb3d2162aa41ff566;552 +0c028d023f06de676b5b1d968c1d8fb1bb106729;568 +1203f53a3f612c5fbfb80fb9060f1037acb78a27;607 +62565081194c1b006d44afc0d36ae43616a41a0d;631 +a764b8976326cdf9cab43d825e1172ced73b4391;650 +d26ef68734762944d6f601a2c90061a6bf7c2d3b;698 +995276c541a1342ded36db9f624fc87bc7fb2bd0;702 +80e4ebffa4401fdb3d8497e456ec5a70a034f2a4;702 +c037a5e3a6eb97d2f9455225bbafeffec5b79be4;702 +b04b5ff009a7c847fbdabc072c8c3fe73096197a;702 +25fd6a0518aa96286387d9d4b1a61d7a0d781fd7;702 +8769fc37e123884b26d0fb9427e81312203b881d;702 +0030bc6418c9244aba1f6af47394bae72505a6ac;702 +44c875abb2a0274cddc9cbdc678b628689932d2b;702 +35d5f7b276b4ead51dfc99c69e1d6c2387afd8f6;714 +2de5139fa83f908d09ecd7700a68d7762f8feb8e;702 +23f9d421a79108f238bb496fcb86cc7c414898b8;702 +61345e8976e536b5a36b8d8c00a4d6221a9cd195;702 +1c18102b128dd419a02b866f3a0d08b7d33c7760;702 +04ced33708df397d2fed653f8d658f66272c407f;702 +8bc32f180373bd414ea8b4d48f93977d097efaaf;796 +58cda53f46739f91bc90fbb6a56befa53d6685c9;823 +46b4c9c3f8bff029310ec147019da0fd39c0e045;853 +db526b1e02680c21ffb0ce14459a7db45029df59;854 +8b452e194c32a729a416ef91e2d9818b65db7539;855 +e1332ae70d08c4ede5bdccc5ea0ceea7309d9c5b;860 +2e0e749572808ba022efc13bb718836b3a718d96;862 +50270091ce303f94e5474fcb5324fd453f37a9d9;930 +aabc7a48453139ccddebc5558af74f760b5fb7cf;930 +ca8eebeff0757ea56cbc1a6accedf7f8897dbb1b;958 + + Property changes on:
[brlcad-commits] SF.net SVN: brlcad:[78335] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78335 http://sourceforge.net/p/brlcad/code/78335 Author: starseeker Date: 2021-02-26 18:09:56 + (Fri, 26 Feb 2021) Log Message: --- Sean spotted r19763 should be a trunk commit. Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-26 13:37:03 UTC (rev 78334) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-26 18:09:56 UTC (rev 78335) @@ -242,4 +242,4 @@ c0737a9252506872ce5ce6cd14207f7c375741da:dmtogl-branch 885ed4c94ec0131f2cba48ffcbb3d0e03e4ecefd:trunk - +e6417be98f27d570d863744f566f5aaf738abbe6:trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78334] brlcad/trunk/misc/repoconv/verify2/git_only.sh
Revision: 78334
http://sourceforge.net/p/brlcad/code/78334
Author: starseeker
Date: 2021-02-26 13:37:03 + (Fri, 26 Feb 2021)
Log Message:
---
script to pull the git commits not associted with an SVN rev, filtering some of
the known inserted commit patterns from SVN era
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/git_only.sh
Added: brlcad/trunk/misc/repoconv/verify2/git_only.sh
===
--- brlcad/trunk/misc/repoconv/verify2/git_only.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/git_only.sh 2021-02-26 13:37:03 UTC
(rev 78334)
@@ -0,0 +1,23 @@
+#!/bin/bash
+rm -f git_only.txt
+git log --all --pretty=format:"%H" > sha1.txt
+while read i; do
+ SHA1=$i
+ REV=$(git log -1 $SHA1 --pretty=format:"%B" |grep svn:revision:|awk
-F':' '{print $3}')
+ if [ "$REV" == "" ]
+ then
+ SDEL=$(git log -1 $SHA1 --pretty=format:"%B" |grep "svn branch
delete")
+ PMV=$(git log -1 $SHA1 --pretty=format:"%B" |grep "preliminary
file move commit")
+ if [ "$SDEL" == "" ] && [ "$PMV" == "" ]
+ then
+ echo "$SHA1"
+ echo "$SHA1" >> git_only_1.txt
+ fi
+ else
+ echo "$REV"
+ fi
+done < sha1.txt
+
+# First two commits are the sync commits - filter them out
+tail -n +3 git_only_1.txt > git_only.txt
+rm git_only_1.txt
Property changes on: brlcad/trunk/misc/repoconv/verify2/git_only.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78333] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78333 http://sourceforge.net/p/brlcad/code/78333 Author: starseeker Date: 2021-02-26 13:29:54 + (Fri, 26 Feb 2021) Log Message: --- Populate svn_rev_updates with all the assignments thus far - these are not the final set, but should be representative enough for testing. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 12:50:31 UTC (rev 78332) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-26 13:29:54 UTC (rev 78333) @@ -1,5 +1,3 @@ -771b3183f9e315f6e1451a1e3462e6f84724a9cd;735 - eb4b12d2baecffdc33a56ba89b29d611395b8f3d;19755 4aac0a9a29752528a36e4882da812857da5e1c6e;19755 2788b39fe6de7e5fbfcdc30b9c38e2a15b69bf63;21635 @@ -137,3 +135,676 @@ 11077485329842c81213eab68006fe5d58b5925f; 67c46ada661fdab789632885c34bf77a277962db;18892 + +df5a981a54d93aec7322503c0ce322eb157bf538;714 +5477169081053dc2f8627ed6362d4b56ae2f7c58;714 +e8eb301a7dba29f519014119d6493455a81a5b35;715 +c6905c73bcd1aeca073da226d89a9383bcf6a4f0;715 +eaf6fa82fc04156a5b072e5b2adc2b7b0ce5530a;715 +e764a16df4995881b2f307d895c8ce1cd371a040;718 +6be112ca4be1bc71e885360b1bc860c2a32df6ee;718 +0792d9fa77bb3bc87e1f87c27b24ef8eba4a34a8;718 +41acf5fc4bd9b0691c92486e93074d885e1d355a;732 +6bd625123b64fcaa485a3fc1509bc0707486debb;732 +8f4bc8ee13442728a6bb2d8e67754f85d3f10e98;732 +d87fc5ce2deae2d6a31e681e0dfbd2364f1ae911;732 +eeef8db219039bfbfe469dbe3bebc36a6c83980d;732 +ff342ccfcc68c00766ff86445aca51a25d426e62;732 +0a152eb9ba9356733ce0364c8a543ba386900aca;733 +4d10abf0d9bdfb10250ae31db77cf7610d5fadaa;733 +cf51142fdc41f9cbc749d7073672061b8058a1ce;733 +e4a4cc9778220aad2e9e3b6b15d791d76e44a9a6;733 +e87e4f11517cf617b2b47ae3e6b631bb14cf650c;733 +f36a445fa9c7da1199469e0b21fc036cae4e36b1;733 +faeb89e5dbd12114a9eafcd05d506852580b5a78;733 +0271af6766134cd1f0ea5d5c70d9c5a73276dead;747 +b06fe2600aa8df9aea590475e92bbe2b0203321e;747 +706ae516d60646f0261be60d3504b393593abe13;753 +a9534bd60b2247c77f8a5db1a53dd29f538b1e20;753 +5471d9ee205333a06fda7ae5017a1640d17bd0e4;762 +cbc631270364fbaa6b9cde0107f2cefb3afd6f42;770 +ff925ba8330b149d29cf4d08df9825c51b647333;770 +26f94c9fc97e03f71d1e98b76a1dc1db44c555c7;770 +e262319dc393c1787bbc5d3bf838a4e05408eb79;770 +5488e0ac3f46449d3427cc114904293d703d658f;770 +1e4e8ca77c749a5a6a0e2a15fd67870935e426b1;776 +90aa4d9a494e4829849ba040ac71b5c6dab317fb;776 +b7da866b6bae61d0a00a464a2a1fae3c742be99c;776 +625acdb4b0cb75ac095a208dd87616adcf8ca90b;781 +be61cb72a094b93557fd73dde08e963c3e1f5490;781 +d661829125f36cf8a8a8b57f264e34c92141172c;781 +ddad90740c8523268f663c60eac9352832cade6b;781 +51a8a923a4a593cf8661cd26c220b391d265767d;782 +975c236271e441decaf4b79d8b135dcd408388b4;782 +d52e2f16ba57d8b7e5ef3cd49b5b64aea2281bf3;782 +ff83d29ea2e058e5f1f916eb158dcaf6daf99720;782 +0f994d47f359b0cfb161310b3228b47b3dbeadc6;787 +43212e750998ac7c343da8d7569656595e1c2af9;787 +c25b55d4d19556c61e0d720a62af31a4a7e51e68;787 +4fb135a5692ed5c87297e349e03d29879d6d7176;790 +5881a44aa6433fb382a198afc23f7d838111de9e;822 +44454cb06e10af77ad298a8e4328368637d93aa5;822 +d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;827 +bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;827 +1c733d8abdc109719c5371801a2db9fc11b103bf;827 +8f931991a4c11cc213983fb6c357175cf61b51fc;827 +688ec2591a6b6d2ad986a8b4472c2ff18716a278;827 +37930d9cad7e191bac25f0a1390798db216aa579;851 +d7fe528584d1c395556877045949730012b3af57;851 +0a1325cb1f90a31e0fac41fd8481e0157603fa6a;851 +26d2feb22e9c0d61d16f86cf93b44149cfb18040;856 +86fca9feff61e05e873f9561810a36604d78c248;856 +d7fe528584d1c395556877045949730012b3af57;859 +fed24ac96fd966363b16a4d6503b6cd928eca7a0;877 +596b3effc765fbc760fe2fae72981ef72830fada;877 +7d3b41fcbfe9d1e70d14e13bc0a7ef75ee36b07e;877 +289fa6f81f56595a88e01bc7903a26b3cce16a0b;877 +b5df44938374cbfab7bdfff203cab88496503f2a;877 +de2bbbc35650b6794f6d1d4c79a426e91e2d1061;877 +6b0bdca2a5ccddaf2cbb80665d3b1da982832f86;877 +f9751d57768054c0ed77323f02ae6bbe04055d40;877 +cbb621081adb4affac5571029064190ca0c2e9b5;877 +67d10d272daa7ed4818c2e2ef71f72ec4024aa1b;877 +0320456c2d1337d85b19cb5acf471f0f0b827255;877 +8eb9238d4a43d1dd1f50b0ed4706e6db251122e0;877 +b705ee7f09fcae83b7b6e47bf6759160aa2a6bb2;877 +92776e080703d89f40e73edb516177e0392a464b;877 +dd3a3a554578e14a80f227323895f719af2369f3;877 +505894a54d939d591cc109a4e0540fdde9dd399f;877 +81a5c601d6658cda283f48729b67e0e30c967605;877 +c89821b9c391711c477c73c767ec4e9ec3af6f37;877 +96b133ca99e9f27b571fb3f6ff464af8617d3d47;877 +9eddc6cc01dc84ede6cf5efab2bd4d5fbd35a576;877 +93dd73c6df5e3b840024f3ef71e479e2872bf835;880 +58b3b9f85c3024c49e9b784eb653bfed13abfcee;880 +d4ee6b24ffe14d4e4cb09c787af16deabb12a0ac;924 +dfabc6f45d00ffe950c8d89c9ccf1315acb2689a;924 +03424ca7f608bc316c58026e877414cce2123232;930 +5715b57d8c544afe2e02b08005b40ead360bb40c;930 +0dbdb78583bda26550f19e21d2d28b7c7b9ecad8;930
[brlcad-commits] SF.net SVN: brlcad:[78332] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78332 http://sourceforge.net/p/brlcad/code/78332 Author: starseeker Date: 2021-02-26 12:50:31 + (Fri, 26 Feb 2021) Log Message: --- Note how to sort these lists by rev number Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-26 03:05:40 UTC (rev 78331) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-26 12:50:31 UTC (rev 78332) @@ -1,3 +1,11 @@ +Useful trick for sorting these by revision rather than sha1: + +sort -n -t ';' -k2 + + + + + Checking into some commit quirks flagged by this logic: 14807 - the commit date and message match 6d6d9077d96b7c851b9d98271aeaa1daeb2b34d2, which is where the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78331] brlcad/trunk/misc/repoconv/verify2/ synth_tags.txt
Revision: 78331 http://sourceforge.net/p/brlcad/code/78331 Author: starseeker Date: 2021-02-26 03:05:40 + (Fri, 26 Feb 2021) Log Message: --- These are the mappings for the 'Synthetic commit' incomplete tags. Not terribly useful, but it does match up a set of SVN numbers. Added Paths: --- brlcad/trunk/misc/repoconv/verify2/synth_tags.txt Added: brlcad/trunk/misc/repoconv/verify2/synth_tags.txt === --- brlcad/trunk/misc/repoconv/verify2/synth_tags.txt (rev 0) +++ brlcad/trunk/misc/repoconv/verify2/synth_tags.txt 2021-02-26 03:05:40 UTC (rev 78331) @@ -0,0 +1,56 @@ +aec96edb58d9409d7c7eaa6017c376838f740fb8;21901 +04f18f0fe5fce3dbc5009026b3db8bb0a51b378d;22236 +0f8b6df62894be583f65f68301ee6c7a21392132;22240 +1c89ad950d7246c6905b0e97494df2d6d6cd7c82;25894 +4e308ad3725cfea2e030df9547a94933412e5779;5813 +baac8bedc249fb743ee62fafaf7a2b4cf1f7dbd8;15815 +4ea41c914c590b0231bb9f861ef4ba0ce78262d7;15816 +d208eab21a102b8429c49b9cbafe856e83efd743;21528 +f1d1f559b2e55dbe8cbbdc25c231dce678b77a2a;26349 +938843e2ad3db920f140fc76b5daa66bdd7cebfe;19767 +3474b07b6ee7bf8c4a0597d1b2684741a02c2cc4;15367 +4850989e3a2f9624127ae043c6094076a60bc472;25160 +2dea9236a580f33946c2e1f901af6bda19cb37a4;20038 +86d3e053888df828967bf4a9dee938c0c460a9f4;23572 +dd29594b300d594e4b8b569e57b5ed968d7faf07;15429 +7b4b410da3c601fe6c5783608f19e1d8f35b8424;22555 +5e29cadce86b09888b86cb8b10511d802fdcc209;22509 +ce30812f2b6d97501056dd89024e90b8967e85e6;22598 +9317d790a2bb14cae0edd359008e2177e61a756d;25911 +a018afa43701e3416db9b2ca96d400cadeb71991;22540 +3085d5c46834626221e46d25afadfaebac8f0af8;2379 +57c41f3974ede14c052dc60fba87af0b71d17468;16892 +eebbeeafab77dca27d4da7f036484480e687471a;16671 +688a0b5100895da93e08ebb6bf8217592d2ebc40;16626 +d0b693d0a17513533b3d9f13ac2b153a741aefae;18836 +ac9bb3a34eecfe61b1ffa93c0574f107b409b970;19376 +6737b66f50085ff152265a091c86b24745d942dd;20055 +137fd08ea6dadd4825f6cfdd3792e5ae281e3d01;21504 +312f28f381ebf4f56f2acd7d3990c1bbc2106b4a;21505 +07f21e9e98a1d316509be2939fb0ef9db73f46c0;21661 +ba190e42c3e6ea8e7dc2425c28cc7cea03d8315f;23550 +e050e3961258e55fc5e2087661460edf94c8efba;23684 +f6e42b38522ccea420f2b317fdbc1e828de20d3c;23704 +6ddbba6c4d27a6987a338f16fb30d5a9911c30c6;23782 +45cacc2e874a9fb6eaf14162a468816743b05f12;27967 +964dd2d24d61d338840d214316076e7b039cff03;28785 +4dab5ccde9d0f0a079d5fe23bf213e096e269b87;23887 +d2288bd418b499386555efd7fe6c5c0c298f63d0;24142 +6fd1a4626b489b3c14a377879dc0fada8f973409;24391 +ea760c8dc6e03247937fa4e4b56d6273ebe37cce;24506 +9d457d0c41a575030fe267ae84285cfd9d10e4fc;24809 +733679a00295ca5312d9ea47126ab40a3c90d369;25172 +9561d0634c2b2662223e6b0f4c659ca470ae0050;25696 +f3af278eca4ab201ad9f0ac058e6fc3ff5a1df55;25892 +21aed46724d81c8d933c72774441d5e1908bbb53;26457 +25a8701ad738e65336c105d5bdaba7635212e625;26597 +fbcfc42b831fe07e4918dbcd664a1d1ad76b6905;27207 +97d02527843ffb84f8bb3da0e64ef5f7db6df28c;23546 +9fdd3cb45bd7059090f8af717d88c680f5ed;24189 +d4f5aaf3a127ec5dfd6793b959521c4e5490ee42;19768 +616545e0232559805c42acb66baeb0397993ac53;25915 +cf7aa2659f6c8103ecaa042cb8c355cd2983fe14;19769 +974d76d2971d709d9b8c78a6dd84c59970a0360b;22507 +23d99bbc2f92bcd94e6a2c3b86f41b0805d4d48b;15340 + + Property changes on: brlcad/trunk/misc/repoconv/verify2/synth_tags.txt ___ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78330] brlcad/trunk/misc/repoconv/verify2/ approximate_check.sh
Revision: 78330
http://sourceforge.net/p/brlcad/code/78330
Author: starseeker
Date: 2021-02-26 00:28:04 + (Fri, 26 Feb 2021)
Log Message:
---
The comm context is actually useful even with the ssdeep metric.
Modified Paths:
--
brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
Modified: brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
===
--- brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-26
00:27:11 UTC (rev 78329)
+++ brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-26
00:28:04 UTC (rev 78330)
@@ -53,21 +53,19 @@
then
ssdeep -b svndiff 2>/dev/null > svndiff.hash
SCORE=$(ssdeep -bm svndiff.hash gitdiff 2>/dev/null|cut
-c 37-)
- if [ "$SCORE" == "" ]
+ if [ "$SCORE" != "" ]
then
- cat svndiff | sort > svndiffsort
- cat gitdiff | sort > gitdiffsort
- mv svndiffsort svndiff
- mv gitdiffsort gitdiff
- comm -12 svndiff gitdiff > commonlines
- SVNWC=$(wc -c svndiff|awk '{print $1}')
- GITWC=$(wc -c gitdiff|awk '{print $1}')
- COMMWC=$(wc -c commonlines|awk '{print $1}')
- echo "ssdeep check failed, using line
comparison fallback..."
- echo "SVN:Git:common line counts:
$SVNWC:$GITWC:$COMMWC"
- else
echo "Similarity score (100->0):$SCORE"
fi
+ cat svndiff | sort > svndiffsort
+ cat gitdiff | sort > gitdiffsort
+ mv svndiffsort svndiff
+ mv gitdiffsort gitdiff
+ comm -12 svndiff gitdiff > commonlines
+ SVNWC=$(wc -c svndiff|awk '{print $1}')
+ GITWC=$(wc -c gitdiff|awk '{print $1}')
+ COMMWC=$(wc -c commonlines|awk '{print $1}')
+ echo "SVN:Git:common line counts: $SVNWC:$GITWC:$COMMWC"
else
echo "DIFFERENCE: Non-empty SVN diff but empty git diff"
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
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78329] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78329 http://sourceforge.net/p/brlcad/code/78329 Author: starseeker Date: 2021-02-26 00:27:11 + (Fri, 26 Feb 2021) Log Message: --- Sean's logic resolved some additional commits Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 20:12:08 UTC (rev 78328) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-26 00:27:11 UTC (rev 78329) @@ -664,3 +664,19 @@ fdd31c42ab1543cb1e6bc19bf4b26600b211891d;3118 9e8441b7de687873484d804b3ad54aa66c822edd;3584 e134462a03e23d3c2e7880dae01035dbe86005d1;3693 + +# Non-unique content matches resolvable with additional info: +420b6c86aebaab8d233b9124aac2dfcaab390158;2253 +3626fd67e335d89391ce624b8a3246bd99adffec;2470 +231fd989a63e842f6ed485d8ac49caec4eee3660;2471 +bbd7e8166d10d1f8c1c3355f87814fd9c4e652df;2489 +1a79a71444aa3900b25c61c321c270d3f83d7065;2657 +0857eeb72eb573cad76f86b770e765349a85a671;2875 +b026f5c0fe0aa8e2d9ca34051a20fb9afb92162a;2884 +3732cf651af0b526eb3ec6bdf5893892f22afef4;2886 +84c054fee5394109f52dfaf15add46d671ede196;2890 +de144fde847a9fe45cac391c97bd7abaeacc3b0b;2900 +d0f9348a8847c22a1f5cb4846f9c7414c7c1081b;3578 + +b79938e73904554259dd66843aba3c093c17a831;19658 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78328] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78328 http://sourceforge.net/p/brlcad/code/78328 Author: starseeker Date: 2021-02-25 20:12:08 + (Thu, 25 Feb 2021) Log Message: --- These commits, identified by inspection as matching, match precisely with sorted diffs. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 20:02:06 UTC (rev 78327) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 20:12:08 UTC (rev 78328) @@ -55,8 +55,6 @@ -d8f7e1e55093bd388a674fd3c6dd28ad8a6bdb22;705 - messages matches this commit, change may match c037a5e3 -0a01f682e650fb09d465363fc9028300124feaa0;706 df5a981a54d93aec7322503c0ce322eb157bf538;714 5477169081053dc2f8627ed6362d4b56ae2f7c58;714 e8eb301a7dba29f519014119d6493455a81a5b35;715 @@ -65,7 +63,6 @@ e764a16df4995881b2f307d895c8ce1cd371a040;718 6be112ca4be1bc71e885360b1bc860c2a32df6ee;718 0792d9fa77bb3bc87e1f87c27b24ef8eba4a34a8;718 -8163445c0df487d14a7c9411fb030fdc02627513;726 41acf5fc4bd9b0691c92486e93074d885e1d355a;732 6bd625123b64fcaa485a3fc1509bc0707486debb;732 8f4bc8ee13442728a6bb2d8e67754f85d3f10e98;732 @@ -103,9 +100,7 @@ 0f994d47f359b0cfb161310b3228b47b3dbeadc6;787 43212e750998ac7c343da8d7569656595e1c2af9;787 c25b55d4d19556c61e0d720a62af31a4a7e51e68;787 -d0d2cf4f2388a012ccb5ddd23a8ba92c5419607d;789 4fb135a5692ed5c87297e349e03d29879d6d7176;790 -27b151db066ea381efdc3190f79917a5bd9bb389;791 5881a44aa6433fb382a198afc23f7d838111de9e;822 44454cb06e10af77ad298a8e4328368637d93aa5;822 d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;827 @@ -275,14 +270,10 @@ df117abb5fe9a8511059e61c54f02040e312b980;2494 382ba73a5e2231d12b786a769c18ebacbe5697d7;2624 a3d077b6782828a5319add9e04e7e1ecfb3cec56;2624 -bcef79fb3ab343ca87bb2316cd3002bcedd6e46b;2658 00939ad950fbe3c7b71eb31daa735de58fdba981;2668 -5c9c7bb1d5fb535c7e4c2cf1c2f19f790601;2664 397dd7c139007e47098d64b80bd6358473242752;2670 866f14b332c9c433051cdbbee5ef37a74a68655d;2670 4fdb089a8c1b993ffb4b4347f35e473dd53f0417;2771 -7d569fba385cb18431262ee5f726e3bab2965b08;2802 -68245f26449e72b3fa8362bfdaa8ec4b458566bc;2841 694ed283d2d0494efc56ddca2d9aa6cc8e083f39;2851 abab356c8454dfa57d2dcc5c18bd5f19cb5f2568;2851 d2c4bfdcae40739d15151e61582c883eaa28522b;2851 @@ -298,20 +289,15 @@ a48aaf4493bb51e9b7880a9f1ae7bc54b6c0ce8d;2970 c2bfb4181ff28a423039eaa9765bbbf932002945;2970 9f7e965f66e0c96fd7053a29e277cb4878a70ee0;3039 -2a18769749a5468bd2a82f8c10f36a95af42cc15;3093 b1a184c6354eea64f4f411d05445645b306cffc8;3102 402419dac49d3abe9bd6036f76696b43a70a66f5;3102 -d49c785ae39c8c3fb7420cd907cd2e7b68db4f70;3113 -fdd31c42ab1543cb1e6bc19bf4b26600b211891d;3118 0be816c211bce68af88da6045db8672c8aff1c21;3150 8085b25a1e68ce2a2c0e83554c70ad7b905ce23d;3150 3fed3b8c6211e9b55101f6195dd8fad34bcd7d54;3328 524c15a240f986cafa9963d1fe9a1926873ff836;3328 8e2de03d1a1fe9fa00b6509701668ab9762692f0;3328 -9e8441b7de687873484d804b3ad54aa66c822edd;3584 06a92fc6f3c667326eeb124608936922a963d224;3639 31a7a8f2677009ecc240aab01267cc0e2f8afe2a;3640 -e134462a03e23d3c2e7880dae01035dbe86005d1;3693 eeb7cfaa353aca3259df37264807df8632a24e03;5142 baed9c767307c8bc9c7d0b2ee8f39c16ba771ec7;10610 8e3652fad96923cce39c1cefdc0ffcd3fa608121;10611 @@ -664,3 +650,17 @@ baed9c767307c8bc9c7d0b2ee8f39c16ba771ec7;10610 8e3652fad96923cce39c1cefdc0ffcd3fa608121;10611 +d8f7e1e55093bd388a674fd3c6dd28ad8a6bdb22;705 +0a01f682e650fb09d465363fc9028300124feaa0;706 +8163445c0df487d14a7c9411fb030fdc02627513;726 +d0d2cf4f2388a012ccb5ddd23a8ba92c5419607d;789 +27b151db066ea381efdc3190f79917a5bd9bb389;791 +bcef79fb3ab343ca87bb2316cd3002bcedd6e46b;2658 +5c9c7bb1d5fb535c7e4c2cf1c2f19f790601;2664 +7d569fba385cb18431262ee5f726e3bab2965b08;2802 +68245f26449e72b3fa8362bfdaa8ec4b458566bc;2841 +2a18769749a5468bd2a82f8c10f36a95af42cc15;3093 +d49c785ae39c8c3fb7420cd907cd2e7b68db4f70;3113 +fdd31c42ab1543cb1e6bc19bf4b26600b211891d;3118 +9e8441b7de687873484d804b3ad54aa66c822edd;3584 +e134462a03e23d3c2e7880dae01035dbe86005d1;3693 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78327] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78327 http://sourceforge.net/p/brlcad/code/78327 Author: starseeker Date: 2021-02-25 20:02:06 + (Thu, 25 Feb 2021) Log Message: --- A few more exact content matches after comparing against the de-rcs processed SVN repo. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 18:50:27 UTC (rev 78326) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 20:02:06 UTC (rev 78327) @@ -657,3 +657,10 @@ 0e35ffd2ca85bfc646576faf3a7ef96b3d10a777;19854 13409b92da0af7ebece9d3d4bd2b31bf66485af8;22314 cd0e026ba4482989ab29b20a19d161e5a40737c1;22412 + +33df72fd9545d677f0d2d80cc42a93bc544d778b;1670 +ae7e0affd84626147bd84c41e0a3520ac14bf2d9;1901 +e78bf1f7a965c3a2dfba1114b376f4baefe9b15e;10558 +baed9c767307c8bc9c7d0b2ee8f39c16ba771ec7;10610 +8e3652fad96923cce39c1cefdc0ffcd3fa608121;10611 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78326] brlcad/trunk/misc/repoconv/verify2
Revision: 78326
http://sourceforge.net/p/brlcad/code/78326
Author: starseeker
Date: 2021-02-25 18:50:27 + (Thu, 25 Feb 2021)
Log Message:
---
Helper scripts for finding git commits relevant to individual SVN revisions.
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/find.sh
brlcad/trunk/misc/repoconv/verify2/find_date.sh
brlcad/trunk/misc/repoconv/verify2/find_initial.sh
Added: brlcad/trunk/misc/repoconv/verify2/find.sh
===
--- brlcad/trunk/misc/repoconv/verify2/find.sh (rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/find.sh 2021-02-25 18:50:27 UTC (rev
78326)
@@ -0,0 +1,20 @@
+#!/bin/bash
+REV=$1
+rm -f files.txt shas.txt
+svn diff -c$1 file:///home/user/brlcad_repo/brlcad|grep ^Index| awk '{print
$2}'|sed -e 's/\// /'|awk '{print $2}' > files.txt
+LOGMSG=$(svn log -c$1 file:///home/user/brlcad_repo/brlcad |tail +4|head -n 1)
+while read p; do
+ git log --pretty=format:"%H;%s" --follow --full-history -- $p > logs
+ grep "$LOGMSG" logs | awk -F';' '{print $1}' > rsha1s.txt
+ while read s; do
+ echo "$s;$REV" >> full.txt
+ done < rsha1s.txt
+ rm rsha1s.txt logs
+done < files.txt
+cat full.txt |sort |uniq > shas.txt
+rm full.txt files.txt
+while read p; do
+ SHA1=$(echo $p | awk -F';' '{print $1}')
+ git log -1 --pretty=format:"%H;%s" $SHA1
+done < shas.txt
+cat shas.txt
Property changes on: brlcad/trunk/misc/repoconv/verify2/find.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/verify2/find_date.sh
===
--- brlcad/trunk/misc/repoconv/verify2/find_date.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/find_date.sh 2021-02-25 18:50:27 UTC
(rev 78326)
@@ -0,0 +1,30 @@
+#!/bin/bash
+REV=$1
+rm -f files.txt shas.txt
+svn diff -c$1 file:///home/user/brlcad_repo/brlcad|grep ^Index| awk '{print
$2}'|sed -e 's/\// /'|awk '{print $2}' > files.txt
+LOGDATE=$(svn log -c$1
file:///home/cyapp/REPO_CONVERT_FINAL/brlcad_repo/brlcad | tail +2|head -n
1|awk -F'|' '{print $3}')
+echo $LOGDATE
+LOGYEAR=$(echo $LOGDATE | awk -F'-' '{print $1'})
+LOGMONTH=$(echo $LOGDATE | awk -F'-' '{print $2'})
+LOGDAY=$(echo $LOGDATE | awk -F'-' '{print $3'} | awk '{print $1}')
+LOGDAY_PREV=$(expr $LOGDAY - 1)
+while read p; do
+ git log --pretty=format:"%H;%s" --follow --since
"$LOGYEAR-$LOGMONTH-$LOGDAY_PREV" --until "$LOGYEAR-$LOGMONTH-$LOGDAY"
--full-history -- $p > logs
+ echo "" >> logs
+ cat logs
+ while read s; do
+ SHA1=$(echo $s | awk -F';' '{print $1}')
+ MSG=$(echo "$s" | awk -F';' '{print $2}')
+ if [ "$MSG" == "*** empty log message ***" ]
+ then
+ echo "$SHA1;$REV" >> full.txt
+ fi
+ done < logs
+done < files.txt
+cat full.txt |sort |uniq > shas.txt
+rm full.txt files.txt
+while read p; do
+ SHA1=$(echo $p | awk -F';' '{print $1}')
+ git log -1 --pretty=format:"%H;%s" $SHA1
+done < shas.txt
+cat shas.txt
Property changes on: brlcad/trunk/misc/repoconv/verify2/find_date.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/verify2/find_initial.sh
===
--- brlcad/trunk/misc/repoconv/verify2/find_initial.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/find_initial.sh 2021-02-25 18:50:27 UTC
(rev 78326)
@@ -0,0 +1,12 @@
+#!/bin/bash
+REV=$1
+rm -f files.txt shas.txt
+svn diff -c$1 file:///home/user/brlcad_repo/brlcad|grep ^Index| awk '{print
$2}'|sed -e 's/\// /'|awk '{print $2}' > files.txt
+while read p; do
+ echo "$p"
+ SHA1=$(git log --follow --full-history --reverse -- $p | head -n 1|awk
'{print $2}')
+ echo "$SHA1;$REV" >> full.txt
+done < files.txt
+cat full.txt |sort|uniq > shas.txt
+rm full.txt
+cat shas.txt
Property changes on: brlcad/trunk/misc/repoconv/verify2/find_initial.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
This was sent by the SourceForge.net collaborative development
[brlcad-commits] SF.net SVN: brlcad:[78325] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78325 http://sourceforge.net/p/brlcad/code/78325 Author: starseeker Date: 2021-02-25 17:24:44 + (Thu, 25 Feb 2021) Log Message: --- Add unique matches based on content diffs. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 17:18:55 UTC (rev 78324) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 17:24:44 UTC (rev 78325) @@ -325,3 +325,335 @@ a212299aaeaf6ba815aa075df56c7cbdff7d139a;19742 8350a6a2a319d98911d7d716bb8f649df1a1c09b;22298 +# The following report unique content matches based on the diffs: + +cf68b049d3f59cf3eb7e73aefa6d2eab979ca649;703 +dc75bc444f77cb2b3fbf7343ed5e94b4cdd6a7b2;704 +fc74a3c802f68fbde905182cc70fad21a64b0f66;707 +a07a27a3366dcca28afd0775975fd79d306bf1b2;717 +3cebe3f01241f9a659bb79997e9f613a21fbf082;720 +f7c49571cc2d78d9e700b2a6586375e77cf9cecb;723 +04f2dfc13157cd564a4cd66382edf617ff933e44;724 +1ccaf08e26f0f81eb085952bab3fc5bcbbb19727;728 +817b6bf26d53e81ddab7c39ea9fcf06f878be828;729 +771b3183f9e315f6e1451a1e3462e6f84724a9cd;735 +284de0ad1bdca0ab22bbda362b2728b260cb5e31;736 +1776e30494cd960f3bcf830e0c3388182d97fb4d;737 +a7f8978588a61d472b492f94013845e1eb14d0e6;741 +871b0ab43c9c36f383b2b2813fcbac71eff9db8a;742 +f706e532e0ea792403c3ee0ba8fca1b81dc41100;743 +1185906215713094c191e194aa2ef5a6c825f8ce;744 +e95fca5cf0c14ca7c78188e0462afb72b21ff845;749 +9172a57ddd78107f5e8b15963ab6f09883a64699;768 +90aa4d9a494e4829849ba040ac71b5c6dab317fb;775 +131ebf452ea00c60ea1686aa3eec27f241886803;777 +b80096222fed6823de67d7cd8cbb72b8a9d950e1;778 +585764793db184394a751e62b42e228d6dc7fc35;786 +d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;824 +bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;825 +1c733d8abdc109719c5371801a2db9fc11b103bf;826 +13e741a53c532b17b3ee3c6db9442611d1b88f10;830 +527c4407c7ab507cdfdaca0e36d3d1e88dc14c2c;831 +22cd753068d378c64b8289c63015caa9375c89a3;832 +706bc226d9f57a8f32398487da668ad2ed6ff8a6;833 +d7a8e8b3252ecbb6a3d3f71718a331f56d7d2fac;886 +d5e50d3c927964ed55b1f5639331d211e09a4944;900 +34d7df58be5a9e9ab1a19c517ed997b8fd75a70e;915 +ba6b0c34261e4e7f712ed150129d44a87fc4f0af;918 +4bd50cebaae9ba7860b5db10dbd1f31a5b9064af;925 +d9d322079d1a11b8d7d35b13b851e1e964982ed8;929 +b23e972dcbc7b221f1ec7deb1c870a9ca4a46ed5;939 +ae53ab2df7b2bdabb90950e11b0d4b0bcac8357f;963 +303cf9cd10b639439f07d9d889bef14d7e7e7e8c;1005 +3739913eba40af89c52c963dec3ba33c97ea0066;1038 +71edf734a47a5f58380b6ab122b5ef565e77bf73;1070 +590d5374b24a428d6590ee8af86a7540086ff208;1095 +147af6064c22baef0e394256c89a3f75d067ba18;1158 +8c9099a6923eac3811524032c0349a1658580a38;1160 +06b23e2a5841059747d73ae7e255d4981b947a9c;1161 +3a6cf1a12ae60032be8c429088618624a3b3fae2;1185 +9eaef84aa4e049a94ca36d2dc5eaaba0f6b22e22;1186 +f2ef87c686f27f4c3d7330f6e69dfa491a7bc9c0;1198 +8666071027ac95b9ab9af8613398a316f22728cc;1204 +b5d57e06cb0b3ce5cfe0d211e8a2d436a31301ca;1208 +5f3a2abe4c8ea38bcfc4142bf3f086613de680d0;1216 +d6c8569ba4a5c8975344f02c96799e18962f0840;1235 +143f498557ae31f280a80b9030c11f09238fe6f3;1241 +4970ad32434f9d422e9ffaa75fd4c8a5c387a319;1265 +dd76dbb02299b5a2632b6959dd4bcd8db8729d32;1268 +14836c5f038d924ad690b81f2bde4d075419eb01;1283 +0e0b8b08239279b549214b95a324afd47775b07a;1318 +85b77047dedd48bffe4047fa8ac880f4b36fb49e;1336 +dbdd422daae2447b041a6f2e6d1a422849fc29fb;1348 +704c095be0efa00b2a32791c1c7cc16964bbb76c;1357 +b96bde6ada18d7c666e88f1ce0c9e63dc38d2967;1385 +4506a85b5c8f5070af9ad9603420660964133b27;1398 +aa03b99e881760f449611d1a47a64882e7cd18a0;1399 +6c330fc95472d04d23d49341e2d8b212ac76e030;1407 +b68bb2fcaf55d345746b01c91a2399f27db22612;1408 +fe9e569f95109a99b23f423fa41a560619dc6e0c;1421 +d3e962d04ae604c0562fdd68c1892cf7d868efc0;1422 +38ddd0d524fdcf62e64ddd6d7bd2325e7b7886fb;1423 +fcd9e35f5313070696ee22017e9070d0c8c7b746;1437 +47a6ac2602fd7ac6f1c384d0c9173815c554e638;1444 +ce4b0a5096ee8242a143449565927e4956ac9389;1446 +ce1ab0cf7909828efb88be01deeafbf7ae0954f5;1447 +c07e1c12bfd1be1223766b7b03cfce240843d48e;1452 +dbc2b9ae1c3e0e6c1f0115385937b3f43e979398;1456 +b49e33b2db056551667da68126b0fedd245b7459;1468 +cc63f25c78fa980df31383e452ce11dfa7b94b62;1472 +e27f9bdb333f2b84f3737148a5720f4056ebf616;1481 +b056b8f344c0b7a9f73ff1465ff531099408c773;1482 +a56f6da5ecf5dc1923787e6777adbf1846d3a4b5;1487 +a0e6482b1da844f66849eada5005b34b0eb22fb5;1489 +03d3012e506e41318a7fa1a94a9fef60ec116fc3;1491 +74d9795c5698eb29923f1a137d24b072f46c6ca0;1501 +5efbe3c988fa048611ea0732583e52925d73dbef;1504 +7e32031751894d203520efd3243a35373cd44772;1506 +b8312411d9def31b816a14882033c58c447e906e;1510 +6fa3080888f8a5c6eaa9e89262cc52510716ab84;1517 +6d1950650660409541149ede91bf91499b449e59;1520 +e1db739e07d073c920e4874bb2fa7c35ab398261;1524 +3d1bbe3a52ec69cbc11a74d5b1add0cbbb4c2099;1534 +11be5173b4ff1f9f684dd1bfff93ced3b62c;1541 +2a9797cbac9d91b5f66a15100a357f0c8df75ef1;1549
[brlcad-commits] SF.net SVN: brlcad:[78324] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78324 http://sourceforge.net/p/brlcad/code/78324 Author: starseeker Date: 2021-02-25 17:18:55 + (Thu, 25 Feb 2021) Log Message: --- More SVN id assignments Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 14:32:41 UTC (rev 78323) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 17:18:55 UTC (rev 78324) @@ -86,7 +86,6 @@ 5471d9ee205333a06fda7ae5017a1640d17bd0e4;762 cbc631270364fbaa6b9cde0107f2cefb3afd6f42;770 ff925ba8330b149d29cf4d08df9825c51b647333;770 -7c46db5f8c0b8873fa5e873e041416917869dc32;770 26f94c9fc97e03f71d1e98b76a1dc1db44c555c7;770 e262319dc393c1787bbc5d3bf838a4e05408eb79;770 5488e0ac3f46449d3427cc114904293d703d658f;770 @@ -140,5 +139,189 @@ c89821b9c391711c477c73c767ec4e9ec3af6f37;877 96b133ca99e9f27b571fb3f6ff464af8617d3d47;877 9eddc6cc01dc84ede6cf5efab2bd4d5fbd35a576;877 +93dd73c6df5e3b840024f3ef71e479e2872bf835;880 +58b3b9f85c3024c49e9b784eb653bfed13abfcee;880 +d4ee6b24ffe14d4e4cb09c787af16deabb12a0ac;924 +dfabc6f45d00ffe950c8d89c9ccf1315acb2689a;924 +03424ca7f608bc316c58026e877414cce2123232;930 +5715b57d8c544afe2e02b08005b40ead360bb40c;930 +0dbdb78583bda26550f19e21d2d28b7c7b9ecad8;930 +92e84a413df16c318f27423252da71f02b438df6;930 +452e55a3bd6e9b6e1eb69c06d258432cfb740338;930 +0d0c3ecd7288c48bfe16d73f5515ae567422ebe0;930 +b17789dee3bc40c804d4988209592804ed78f11c;930 +6457f26e0602f4a2532cffb7dc5d9439a09d99b2;930 +f86afd95ad58533c45e127d324c24c489482e7a4;930 +4c2229f7bf609b47ad6bbbd39e4a58af5f5d207c;930 +3d2349d5d0758857152ced8266e62243bfb91543;930 +b0ed3bae43f961a716bccc0d11adc8f28f78861d;930 +a46f07eb8ff308766435f8c7ff4ac84c081ccaa1;930 +19f3f28cab6f70c70e59af96fdb7239710ae1e5a;930 +dd1507820c1714a7c33774164621853713cab9f5;1194 +edfe6019eebcc773e4a68e795fbb8e9a0ebaea59;1194 +579c434b80eb5ec35e47b114a1e01b1067991ab1;1412 +fb04928f3e414b95570ce2a9524e1d365e849925;1412 +49dbf1a4c6c4901541372ae70111a549c0929208;1412 +103592f6a943db85483d5ff50a0de47111f70208;1413 +566f07f669bcb385221ab622d84c605a9ab274c6;1413 +9aa7c2b5c4451d85c0a78e1702c4a3d108a9dbd5;1413 +ba7a7c6c294c8cce3ff05e10f37f58a0130d18a5;1413 +be7fe830733088965fd2f1aa66b50c8ecb9012c8;1413 +cedd2e41e9329cb3b4a91f41e845bf6be7488d47;1413 +d8ed0815228af8ed792095fe3a15d649e50e1b64;1413 +912ef299c7d40ba69beffcd61522d4630decf676;1420 +a050b1e013866035753d0304a40a8d5b0666133f;1420 +cfe37e786700a9a3a8c48b8bc7813f1dbfb10409;1420 +2a14e7231fb75afa4bb8c7d1dddbedb0cd7e4ca2;1448 +71115643865038ec967e01e4ea410dd7e9bf13f2;1448 +edaea26b3f1a8fd47857ce4fba7ae3c26128e2d2;1448 +203649fc1c09549212846ae4e1a5fa6c960d24b6;1471 +dc6ff1d5149b5621ab90c27bae220e7e3bc62603;1471 +4893397764fb422256263af4044e671c3ff81518;1474 +73f58ef230218911a21d727a341a0e345bc50766;1474 +c4f6b2953c987e4d2d117bbadd62712d2339e2f5;1474 +426dd5adb589c4c25f93914db352b576de14045d;1539 +fde45c58c7eea0e10b07308fdc4b62988ad7552a;1539 +af81639aa45e948b5ddb8a018f1fd7a157190de6;1553 +f687b26928e6cc2c6ee98955d239a2a9abce1405;1553 +1585724cd5b07642277b781255a2451c2d81a1ed;1566 +b0c5acf7f4ee314c1c63ebeb2c1732936bc5986a;1566 +2fa4a9704caa35416324fb7c56c678ce1a30a6b0;1578 +de0daf8dda54011ea668912ebf70c5119d8eaf14;1578 +f724c638ed416122cde90577c1bb0f34d08682d1;1578 +8b67734b429b9343f22aba72c611e468984d9249;1586 +c86db4a5d26b33ceabbfa931272f428053d213ab;1586 +2caf61f7e2197dcb0d1d5d179d45a600757c3d0a;1627 +fa5accb55543f710df51459798b4e30af2fc54d5;1627 +5c857a84c619288f3a4ddce4c433c6cdf1e2ba30;1640 +e7602b91d23a4b3c574811945ec29c24b79495c0;1640 +86a7fcc40057934832f61255b606c0bd6f7fc12b;1644 +a6feb76ce1551b09222463514f15e65db0343b55;1644 +30e608abb855c61aaa63e68da5676d712db49eee;1649 +fdf64b1001967af880aac1796068b093c484dc6d;1649 +3e4db0206c38a7eaf3a2481efbd00bca78088951;1654 +5b98dd72f9a129be9e7244382fa85def2a510674;1654 +7e426d7423a837db7d8539a759b813a5d7f471ee;1654 +8812906a22c65915d1849ead011e8f8e0dc293e8;1654 +fcbe58b89e22aece9d44c271832589e477edb573;1654 +1e8860b08e37cf5bcc6fd5aa1f90888eaeb26686;1665 +f135b04cbcedc7d567136d6ecf5b05b60182ef1d;1665 +33df72fd9545d677f0d2d80cc42a93bc544d778b;1670 +a59ebf0337e8e4d083afc3bdcf55c0bfbd186d8f;1679 +e7faf9a15a531815e95bee4c35f37371e893f31d;1679 +0eae72227fd87257168df06a2010c61cc80082ec;1713 +55da4ccdd76e158171659e32602425f31dd0a39c;1713 +d37dacb229879b9df5c292106502d8d90a9ef14a;1713 +da3018b463ed45639dc54f4be3c90f807ad481b2;1713 +006c852fb89542b35c36217a8a721d86216c5d4e;1742 +f0cedb896c686fcc1ed214289ec625e411148f7d;1742 +d6f892b8967011d389a800a3f847bb9281907a94;1778 +f14e045a93ba4e3cee7c96d53497cdea424122b6;1778 +f6da6797ec3db0d32321f1bc3236e330c7ae2321;1778 +40a159fc797f88a4b0b3a10e5bcf71600f54b373;1820 +96b477fac993fdffb13a2fddf04a240bae2d9e3a;1820 +d337aabb79c5825f5739fc8c7f06fa40738d2495;1820 +55e230149dee282d8cbdfdee7c29d03aa67c4ca1;1848 +d1da5fd167e48b8ac519159f52ffe632dcfb293b;1848
[brlcad-commits] SF.net SVN: brlcad:[78323] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78323 http://sourceforge.net/p/brlcad/code/78323 Author: starseeker Date: 2021-02-25 14:32:41 + (Thu, 25 Feb 2021) Log Message: --- Add more SVN commit id mappings. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 05:03:18 UTC (rev 78322) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 14:32:41 UTC (rev 78323) @@ -66,24 +66,79 @@ 6be112ca4be1bc71e885360b1bc860c2a32df6ee;718 0792d9fa77bb3bc87e1f87c27b24ef8eba4a34a8;718 8163445c0df487d14a7c9411fb030fdc02627513;726 -ff342ccfcc68c00766ff86445aca51a25d426e62;732 -eeef8db219039bfbfe469dbe3bebc36a6c83980d;732 -d87fc5ce2deae2d6a31e681e0dfbd2364f1ae911;732 41acf5fc4bd9b0691c92486e93074d885e1d355a;732 6bd625123b64fcaa485a3fc1509bc0707486debb;732 8f4bc8ee13442728a6bb2d8e67754f85d3f10e98;732 - - +d87fc5ce2deae2d6a31e681e0dfbd2364f1ae911;732 +eeef8db219039bfbfe469dbe3bebc36a6c83980d;732 +ff342ccfcc68c00766ff86445aca51a25d426e62;732 0a152eb9ba9356733ce0364c8a543ba386900aca;733 -5471d9ee205333a06fda7ae5017a1640d17bd0e4;747 +4d10abf0d9bdfb10250ae31db77cf7610d5fadaa;733 +cf51142fdc41f9cbc749d7073672061b8058a1ce;733 +e4a4cc9778220aad2e9e3b6b15d791d76e44a9a6;733 +e87e4f11517cf617b2b47ae3e6b631bb14cf650c;733 +f36a445fa9c7da1199469e0b21fc036cae4e36b1;733 +faeb89e5dbd12114a9eafcd05d506852580b5a78;733 +0271af6766134cd1f0ea5d5c70d9c5a73276dead;747 +b06fe2600aa8df9aea590475e92bbe2b0203321e;747 +706ae516d60646f0261be60d3504b393593abe13;753 +a9534bd60b2247c77f8a5db1a53dd29f538b1e20;753 +5471d9ee205333a06fda7ae5017a1640d17bd0e4;762 +cbc631270364fbaa6b9cde0107f2cefb3afd6f42;770 +ff925ba8330b149d29cf4d08df9825c51b647333;770 +7c46db5f8c0b8873fa5e873e041416917869dc32;770 +26f94c9fc97e03f71d1e98b76a1dc1db44c555c7;770 +e262319dc393c1787bbc5d3bf838a4e05408eb79;770 +5488e0ac3f46449d3427cc114904293d703d658f;770 +1e4e8ca77c749a5a6a0e2a15fd67870935e426b1;776 +90aa4d9a494e4829849ba040ac71b5c6dab317fb;776 +b7da866b6bae61d0a00a464a2a1fae3c742be99c;776 +625acdb4b0cb75ac095a208dd87616adcf8ca90b;781 +be61cb72a094b93557fd73dde08e963c3e1f5490;781 +d661829125f36cf8a8a8b57f264e34c92141172c;781 +ddad90740c8523268f663c60eac9352832cade6b;781 +51a8a923a4a593cf8661cd26c220b391d265767d;782 +975c236271e441decaf4b79d8b135dcd408388b4;782 +d52e2f16ba57d8b7e5ef3cd49b5b64aea2281bf3;782 +ff83d29ea2e058e5f1f916eb158dcaf6daf99720;782 +0f994d47f359b0cfb161310b3228b47b3dbeadc6;787 +43212e750998ac7c343da8d7569656595e1c2af9;787 +c25b55d4d19556c61e0d720a62af31a4a7e51e68;787 +d0d2cf4f2388a012ccb5ddd23a8ba92c5419607d;789 +4fb135a5692ed5c87297e349e03d29879d6d7176;790 +27b151db066ea381efdc3190f79917a5bd9bb389;791 +5881a44aa6433fb382a198afc23f7d838111de9e;822 +44454cb06e10af77ad298a8e4328368637d93aa5;822 +d438cbf84df6e3c4e1ec0ba34d28b3efdc176e28;827 +bf5e6094c76baf079b3194a2f2cdeb85eaf48ce7;827 +1c733d8abdc109719c5371801a2db9fc11b103bf;827 +8f931991a4c11cc213983fb6c357175cf61b51fc;827 +688ec2591a6b6d2ad986a8b4472c2ff18716a278;827 +37930d9cad7e191bac25f0a1390798db216aa579;851 +d7fe528584d1c395556877045949730012b3af57;851 +0a1325cb1f90a31e0fac41fd8481e0157603fa6a;851 +26d2feb22e9c0d61d16f86cf93b44149cfb18040;856 +86fca9feff61e05e873f9561810a36604d78c248;856 +d7fe528584d1c395556877045949730012b3af57;859 +fed24ac96fd966363b16a4d6503b6cd928eca7a0;877 +596b3effc765fbc760fe2fae72981ef72830fada;877 +7d3b41fcbfe9d1e70d14e13bc0a7ef75ee36b07e;877 +289fa6f81f56595a88e01bc7903a26b3cce16a0b;877 +b5df44938374cbfab7bdfff203cab88496503f2a;877 +de2bbbc35650b6794f6d1d4c79a426e91e2d1061;877 +6b0bdca2a5ccddaf2cbb80665d3b1da982832f86;877 +f9751d57768054c0ed77323f02ae6bbe04055d40;877 +cbb621081adb4affac5571029064190ca0c2e9b5;877 +67d10d272daa7ed4818c2e2ef71f72ec4024aa1b;877 +0320456c2d1337d85b19cb5acf471f0f0b827255;877 +8eb9238d4a43d1dd1f50b0ed4706e6db251122e0;877 +b705ee7f09fcae83b7b6e47bf6759160aa2a6bb2;877 +92776e080703d89f40e73edb516177e0392a464b;877 +dd3a3a554578e14a80f227323895f719af2369f3;877 +505894a54d939d591cc109a4e0540fdde9dd399f;877 +81a5c601d6658cda283f48729b67e0e30c967605;877 +c89821b9c391711c477c73c767ec4e9ec3af6f37;877 +96b133ca99e9f27b571fb3f6ff464af8617d3d47;877 +9eddc6cc01dc84ede6cf5efab2bd4d5fbd35a576;877 - - - - - - - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78322] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78322 http://sourceforge.net/p/brlcad/code/78322 Author: starseeker Date: 2021-02-25 05:03:18 + (Thu, 25 Feb 2021) Log Message: --- Using 'git log --follow --full-history -- file/path' to identify early commits associated with early unmapped revisions. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 04:29:18 UTC (rev 78321) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 05:03:18 UTC (rev 78322) @@ -51,3 +51,39 @@ corresponds to the commit on trunk. Resolution - leave as is. + + + + +d8f7e1e55093bd388a674fd3c6dd28ad8a6bdb22;705 - messages matches this commit, change may match c037a5e3 +0a01f682e650fb09d465363fc9028300124feaa0;706 +df5a981a54d93aec7322503c0ce322eb157bf538;714 +5477169081053dc2f8627ed6362d4b56ae2f7c58;714 +e8eb301a7dba29f519014119d6493455a81a5b35;715 +c6905c73bcd1aeca073da226d89a9383bcf6a4f0;715 +eaf6fa82fc04156a5b072e5b2adc2b7b0ce5530a;715 +e764a16df4995881b2f307d895c8ce1cd371a040;718 +6be112ca4be1bc71e885360b1bc860c2a32df6ee;718 +0792d9fa77bb3bc87e1f87c27b24ef8eba4a34a8;718 +8163445c0df487d14a7c9411fb030fdc02627513;726 +ff342ccfcc68c00766ff86445aca51a25d426e62;732 +eeef8db219039bfbfe469dbe3bebc36a6c83980d;732 +d87fc5ce2deae2d6a31e681e0dfbd2364f1ae911;732 +41acf5fc4bd9b0691c92486e93074d885e1d355a;732 +6bd625123b64fcaa485a3fc1509bc0707486debb;732 +8f4bc8ee13442728a6bb2d8e67754f85d3f10e98;732 + + +0a152eb9ba9356733ce0364c8a543ba386900aca;733 +5471d9ee205333a06fda7ae5017a1640d17bd0e4;747 + + + + + + + + + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78321] brlcad/trunk/misc/repoconv
Revision: 78321 http://sourceforge.net/p/brlcad/code/78321 Author: starseeker Date: 2021-02-25 04:29:18 + (Thu, 25 Feb 2021) Log Message: --- Add some notes inspecting various commits, as well as one identified update. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Added Paths: --- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-25 03:52:30 UTC (rev 78320) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-25 04:29:18 UTC (rev 78321) @@ -135,3 +135,5 @@ a098425430db227021617976961e6b51ce5569cb; e6417be98f27d570d863744f566f5aaf738abbe6; 11077485329842c81213eab68006fe5d58b5925f; + +67c46ada661fdab789632885c34bf77a277962db;18892 Added: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES(rev 0) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 04:29:18 UTC (rev 78321) @@ -0,0 +1,53 @@ +Checking into some commit quirks flagged by this logic: + +14807 - the commit date and message match 6d6d9077d96b7c851b9d98271aeaa1daeb2b34d2, which is where the +SVN label is currently set. The contents, however, do not match what SVN reports. (They do match +73d4caa899113a2e28b401b616d1d44832a0bd52, which also matches - and is assigned r14726.) + +Resolution - leaving as is + + + +18992 - unassigned in git. The commit that looks like it has these contents is tagged as 18993 +(67c46ada661fdab789632885c34bf77a277962db). However, 18993 in SVN is a properties commit. + +Resolution - update 67c46ada661 to 18992 + + +19261 - unassigned in git. In SVN this is a "manufactured" commit. The commit identified as being +a content match for 19261 is 06c6b8ddb02c633f596585538b708924d75c6f0b, which is labeled with r19275. +r19275 has the "libtclhooks" commit message in SVN. + +Resolution - leaving as is + + +19762 - unassigned in git. Commit with matching content is identified as 19763, which appears to be +the same patch. + +Resolution - leaving as is - this looks like it may be the result of a cvs-fast-export processing difference. + + +19936 - This commit in SVN adds a file. The corresponding Git commit adding the file is +b5e3e3f1b3fff8b526b80295b8deea35712afc79, which is tagged as 19937. In SVN 19937 is a property change, +and 19936 is a generated commit to create a branch. + +Resolution - leaving as is - Git output is functionally equivalent and looks cleaner. + + +4737 - flagged as being a match for 4072c1d01d61f24eb4045225a86b6f80d613aea1, which is tagged as 4829. +4737 is a cvs2svn generated commit adding the file, and 4829 is an SVN property change. + +Resolution - leaving as is. + + +4800 - The Git diff and the SVN diff do the same thing in different ways - no issue. + + +4984 - The Git diff and the SVN diff do the same thing in different ways - no issue. + + +7879 - Adds a file to a branch. Git commit b5f00fd6639a1f11aa28c5e4dbcb628499b8d467 has the change, +with a better commit message, which apparently serves for trunk and the branch. Tagged as r7878, which +corresponds to the commit on trunk. + +Resolution - leave as is. Property changes on: brlcad/trunk/misc/repoconv/verify2/NOTES ___ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78320] brlcad/trunk/misc/repoconv
Revision: 78320
http://sourceforge.net/p/brlcad/code/78320
Author: starseeker
Date: 2021-02-25 03:52:30 + (Thu, 25 Feb 2021)
Log Message:
---
Stash some experiments with content based introspection into the repositories.
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/
brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
brlcad/trunk/misc/repoconv/verify2/git_info.sh
brlcad/trunk/misc/repoconv/verify2/git_svn_map.sh
brlcad/trunk/misc/repoconv/verify2/maps.cxx
brlcad/trunk/misc/repoconv/verify2/svn_diffs.sh
brlcad/trunk/misc/repoconv/verify2/svn_logs.sh
brlcad/trunk/misc/repoconv/verify2/svn_noncad.sh
Added: brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
===
--- brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-25
03:52:30 UTC (rev 78320)
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+# Note - ssdeep needs files >=4k. For smaller files, we just use
https://superuser.com/a/459121
+# to get a sense of shared lines, unless/until something better turns up...
+
+CWD=$(pwd)
+
+if [ "$#" -ne "3" ]
+then
+echo "ssdeepcheck SVN_REPO GIT_REPO input_file"
+exit 1
+fi
+SVNREPO=$1
+GITREPO=$2
+input_file=$CWD/$3
+
+if [ ! -d $SVNREPO ]
+then
+echo "$SVNREPO does not exist"
+exit 1
+fi
+if [ ! -d $GITREPO ]
+then
+echo "$GITREPO does not exist"
+exit 1
+fi
+if [ ! -f $input_file ]
+then
+input_file=$3
+if [ ! -f $input_file ]
+then
+echo "$input_file does not exist"
+exit 1
+fi
+fi
+
+cat $input_file |sort -n > intmp
+mv intmp $input_file
+
+while read p; do
+ REV=$(echo "$p" | awk -F'[;]' '{print $1}')
+ SHA1=$(echo "$p" | awk -F'[;]' '{print $2}')
+
+ echo ""
+ echo "$REV -> $SHA1 :"
+
+ svn diff --ignore-properties -c$REV file://$SVNREPO |grep
"^[-+].*"|grep -v "[-][-][-]" | grep -v "+++" |grep -v "^[-]$"|grep -v "^+$" >
svndiff
+ cd $GITREPO && git diff $SHA1^! ':(exclude).gitignore' |grep
"^[-+].*"|grep -v "[-][-][-]" | grep -v "+++" | grep -v "^[-]$"|grep -v "^+$" >
$CWD/gitdiff
+ cd $CWD
+ if [ -s svndiff ]
+ then
+ if [ -s gitdiff ]
+ then
+ ssdeep -b svndiff 2>/dev/null > svndiff.hash
+ SCORE=$(ssdeep -bm svndiff.hash gitdiff 2>/dev/null|cut
-c 37-)
+ if [ "$SCORE" == "" ]
+ then
+ cat svndiff | sort > svndiffsort
+ cat gitdiff | sort > gitdiffsort
+ mv svndiffsort svndiff
+ mv gitdiffsort gitdiff
+ comm -12 svndiff gitdiff > commonlines
+ SVNWC=$(wc -c svndiff|awk '{print $1}')
+ GITWC=$(wc -c gitdiff|awk '{print $1}')
+ COMMWC=$(wc -c commonlines|awk '{print $1}')
+ echo "ssdeep check failed, using line
comparison fallback..."
+ echo "SVN:Git:common line counts:
$SVNWC:$GITWC:$COMMWC"
+ else
+ echo "Similarity score (100->0):$SCORE"
+ fi
+ else
+ echo "DIFFERENCE: Non-empty SVN diff but empty git diff"
+ fi
+ else
+ if [ -s gitdiff ]
+ then
+ echo "DIFFERENCE: Empty svn diff but non empty git diff"
+ else
+ echo "both diffs empty"
+ fi
+ fi
+done < $input_file
+
Property changes on: brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
Added: brlcad/trunk/misc/repoconv/verify2/git_info.sh
===
--- brlcad/trunk/misc/repoconv/verify2/git_info.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/git_info.sh 2021-02-25 03:52:30 UTC
(rev 78320)
@@ -0,0 +1,11 @@
+#!/bin/bash
+rm -f git_diffs.txt git_logs.txt
+git log --all --pretty=format:"%H" > sha1.txt
+while read i; do
+ SHA1=$i
+ LOGMSGMD5=$(git log -1 --pretty=format:"%B" $SHA1 |grep -v '^cvs:' |
grep -v '^svn:' | perl -0777 -pe 's/[-[:space:]]*//g' | md5sum| awk '{print
$1}')
+ DIFFMD5=$(git diff $SHA1^! ':(exclude).gitignore' |grep "^[-+].*"|grep
-v "[-][-][-]" | grep -v "+++" | grep -v
[brlcad-commits] SF.net SVN: brlcad:[78319] brlcad/trunk/misc
Revision: 78319 http://sourceforge.net/p/brlcad/code/78319 Author: starseeker Date: 2021-02-24 19:39:22 + (Wed, 24 Feb 2021) Log Message: --- Reviewing the CVS era empty commits, some of these have no uniquely useful messages. Deliberately leaving some empties that either have a commit message or appear related to a branch in some fashion, and not altering the SVN era empties (many of which document branch additions/deletions) but we should be able to clean these up. Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Added Paths: --- brlcad/trunk/misc/repoconv/remove_commits.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-02-24 18:20:21 UTC (rev 78318) +++ brlcad/trunk/misc/CMakeLists.txt2021-02-24 19:39:22 UTC (rev 78319) @@ -249,6 +249,7 @@ repoconv/svn_msgs.cxx repoconv/svn_rev_updates.txt repoconv/branch_corrections.txt + repoconv/remove_commits.txt repoconv/svnfexport.cxx repoconv/svnfexport_git.cxx repoconv/svnfexport_svn.cxx Added: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt (rev 0) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-02-24 19:39:22 UTC (rev 78319) @@ -0,0 +1,171 @@ + +52036a8b4569b8ffe90e2e8fb0b43f5ed36ba040 # SVN property change +908505f8729b4ff7668d91680abc5a70f9c051e1 # No-op among similar commit msg cvs-fast-export commits +52ce70a73df181ca19e683e3b23321ab87312294 # No-op among similar commit msg cvs-fast-export commits +607c2b5e3a6a5270778c40266ab7ea3d7e49affc # No-op among similar commit msg cvs-fast-export commits +6ae14458f214924da4a66e950543b3f5d03b1871 # No-op among similar commit msg cvs-fast-export commits +3540105f0c2836d4111f5fc031e595eede1f60aa # No-op among similar commit msg cvs-fast-export commits +98c65896c973e957249e875f32439460a1f9d39d # No-op among similar commit msg cvs-fast-export commits +4e3176d6051918ac3267e6624f3fb3a5fa16bf87 # No-op among similar commit msg cvs-fast-export commits +4b7fb1d0bcb47269564725a52eb6d8ed67eb89ec # No-op among similar commit msg cvs-fast-export commits +ba29664ad729dca912a42c009d67b788cde2 # No-op among similar commit msg cvs-fast-export commits +a8ff19d9f34c233b6905d21a993916fd5cc732b9 # No-op among similar commit msg cvs-fast-export commits +1399705608569f244bc7ae8f2690a25bc588672d # No-op among similar commit msg cvs-fast-export commits +d0e70965fc4a50a14c0ac5ee4edcf914403a0dfc # No-op among similar commit msg cvs-fast-export commits +4ab1cc49d2f9b609cabb463fa2481cf8a0ea7701 # No-op among similar commit msg cvs-fast-export commits +e6f62fd2447945302ccffa359de62a86885c59f8 # No-op among similar commit msg cvs-fast-export commits +396ca751d121e38f6f6199d19f7d5c2ac661cad0 # No-op among similar commit msg cvs-fast-export commits +bf32a7d39a6a52e3ec34e45b5cb42ff78d91efcd # No-op among similar commit msg cvs-fast-export commits +9beadcf34aee1d55d3e4d7048c6f7e8c408e8058 # No-op among similar commit msg cvs-fast-export commits +d26a41cd13c73d6b10300f2b0481fa0c5ab07628 # No-op among similar commit msg cvs-fast-export commits +f5e3f58b08d8b7818bbd112d767c6f4d4119eb9a # No-op +0bcb9564e791f43ee6222827a7ebbab8828c43cd # No-op +c794b2431dc7a1641021e02d2cef84716f46add1 # No-op +22336a6ff944d8c35f4eaac9efa258d4f8302ba8 # No-op +c2cc13991e3671730a828c7041772993d838695a # No-op among similar commit msg cvs-fast-export commits +eec96cfadde20486e7f8656d7bb9b2c39ea85cc6 # No-op among similar commit msg cvs-fast-export commits +96c4f80011381a6e609ac6f9bae491978c161630 # No-op among similar commit msg cvs-fast-export commits +e4b80f631e291bef42dec688d267d42ff9c06891 # No-op among similar commit msg cvs-fast-export commits +65c7c093d88c10fde81efa45111da7251d0fc5cb # No-op among similar commit msg cvs-fast-export commits +7bf0316295c7a6d6e622806e860ee549419af610 # No-op among similar commit msg cvs-fast-export commits +20df719e3f54fcfe76593cfb823dbe0ba947fcd6 # SVN property change +80f4fd1d39815cdaf00c27ab6e3f6b575342e6e3 # SVN property change +a8a88dbfeb5f1d5dff573151bcc7b580aa300d8a # SVN property change +91b5745ba9a54f14c5394cea6d4dc060121b41b0 # SVN property change +55ac4729471d0ab74140bcf82b98df0311df50e5 # SVN property change +ae03f832b24e11e6e5fea152f3f05494f316535f # SVN property change +19d63a3fe6011f31d5ad6251c0b3db34d23410cf # SVN property change +646499cecb037e97c382839d253bc72ecffd7a54 # SVN property change +a92aa295fbae0fe8575c4d2bf21ef2dc66e8215e # SVN property change +42c761e6f179e9bdd609c5078c1bbdbb8625 # SVN property change +24d6d39015164be76d2092054b952a30ce27a88d # SVN property change +c8b16c8005cdd73209b876e24526120be9ac70c8 # SVN property change +b491cb60d6cb1d35b9b03919a6f1c052f13a7b9f # No-op among similar commit msg cvs-fast-export
[brlcad-commits] SF.net SVN: brlcad:[78317] brlcad/trunk
Revision: 78317
http://sourceforge.net/p/brlcad/code/78317
Author: starseeker
Date: 2021-02-24 18:11:55 + (Wed, 24 Feb 2021)
Log Message:
---
If we're switching back and forth between full and object searches, the UNIQ_DB
flag may be set incorrectly. Make sure the flag for unique path returns is
unset before invoking a full path db_search. Reported by Sean.
Modified Paths:
--
brlcad/trunk/NEWS
brlcad/trunk/src/libged/search/search.c
Modified: brlcad/trunk/NEWS
===
--- brlcad/trunk/NEWS 2021-02-24 16:45:51 UTC (rev 78316)
+++ brlcad/trunk/NEWS 2021-02-24 18:11:55 UTC (rev 78317)
@@ -13,6 +13,7 @@
--- 2021-XX-XX Release 7.32.4 ---
--
+* fixed mixing object and full path searches in MGED - Cliff Yapp
* fixed launching of ISST graphical viewer - Cliff Yapp
* updated stepcode to latest upstream version - Cliff Yapp
Modified: brlcad/trunk/src/libged/search/search.c
===
--- brlcad/trunk/src/libged/search/search.c 2021-02-24 16:45:51 UTC (rev
78316)
+++ brlcad/trunk/src/libged/search/search.c 2021-02-24 18:11:55 UTC (rev
78317)
@@ -579,6 +579,7 @@
switch (search->search_type) {
case 0:
+ flags &= ~DB_SEARCH_RETURN_UNIQ_DP;
(void)db_search(search_results, flags,
bu_vls_addr(_string), 1, _path, gedp->ged_wdbp->dbip, ctx);
sr_len = j = BU_PTBL_LEN(search_results);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78316] brlcad/trunk/doc/docbook/system/mann/search.xml
Revision: 78316 http://sourceforge.net/p/brlcad/code/78316 Author: starseeker Date: 2021-02-24 16:45:51 + (Wed, 24 Feb 2021) Log Message: --- Add a search example finding regions contining a specific object included using a specific boolean operation. Modified Paths: -- brlcad/trunk/doc/docbook/system/mann/search.xml Modified: brlcad/trunk/doc/docbook/system/mann/search.xml === --- brlcad/trunk/doc/docbook/system/mann/search.xml 2021-02-23 23:04:16 UTC (rev 78315) +++ brlcad/trunk/doc/docbook/system/mann/search.xml 2021-02-24 16:45:51 UTC (rev 78316) @@ -924,6 +924,17 @@ +Finding all regions containing an intersection of obj2 + + + search |/ -maxdepth 0 -type region -above ( -name obj2 -bool + ) + + + Prints all regions immediately above obj2 where obj2 is included using an intersection + operation. + + + Finding all Plate-Mode BoT Objects This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78315] brlcad/trunk/misc/repowork
Revision: 78315
http://sourceforge.net/p/brlcad/code/78315
Author: starseeker
Date: 2021-02-23 23:04:16 + (Tue, 23 Feb 2021)
Log Message:
---
Add the ability to remove commits from the history (take a SHA1 list of commits
to remove.)
Modified Paths:
--
brlcad/trunk/misc/repowork/commit.cpp
brlcad/trunk/misc/repowork/repowork.cpp
brlcad/trunk/misc/repowork/repowork.h
Modified: brlcad/trunk/misc/repowork/commit.cpp
===
--- brlcad/trunk/misc/repowork/commit.cpp 2021-02-23 19:26:17 UTC (rev
78314)
+++ brlcad/trunk/misc/repowork/commit.cpp 2021-02-23 23:04:16 UTC (rev
78315)
@@ -639,6 +639,9 @@
return -1;
}
+if (c->skip_commit)
+ return 0;
+
// If this is a reset commit, it's handled quite differently
if (c->reset_commit) {
outfile << "reset " << c->branch << "\n";
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-23 19:26:17 UTC (rev
78314)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-23 23:04:16 UTC (rev
78315)
@@ -556,6 +556,75 @@
}
int
+git_remove_commits(git_fi_data *s, std::string _commits)
+{
+if (!s->have_sha1s) {
+ std::cerr << "Fatal - commit removal requested, but don't have original
sha1 ids - redo fast-export with the --show-original-ids option.\n";
+ exit(1);
+}
+
+std::ifstream infile_remove_commits(remove_commits, std::ifstream::binary);
+if (remove_commits.length() && !infile_remove_commits.good()) {
+ std::cerr << "Could not open remove_commits file: " << remove_commits
<< "\n";
+ exit(-1);
+}
+std::set remove_sha1s;
+if (infile_remove_commits.good()) {
+ std::string line;
+ while (std::getline(infile_remove_commits, line)) {
+ // Skip anything the wrong length
+ if (line.length() != 40) {
+ continue;
+ }
+ remove_sha1s.insert(line);
+ std::cout << "remove sha1: " << line << "\n";
+ bool valid = false;
+ for (size_t i = 0; i < s->commits.size(); i++) {
+ if (s->commits[i].id.sha1 == line) {
+ valid = true;
+ break;
+ }
+ }
+ if (!valid) {
+ std::cout << "INVALID sha1 supplied for removal!\n";
+ }
+ }
+
+ infile_remove_commits.close();
+}
+
+
+std::set::iterator r_it;
+for (r_it = remove_sha1s.begin(); r_it != remove_sha1s.end(); r_it++) {
+ git_commitish rfrom;
+ git_commitish rish;
+ for (size_t i = 0; i < s->commits.size(); i++) {
+ if (s->commits[i].id.sha1 == *r_it) {
+ rfrom = s->commits[i].from;
+ rish = s->commits[i].id;
+ s->commits[i].skip_commit = true;
+ break;
+ }
+ }
+ // Update any references
+ for (size_t i = 0; i < s->commits.size(); i++) {
+ if (s->commits[i].from == rish) {
+ std::cout << *r_it << " removal: updating from commit for " <<
s->commits[i].id.sha1 << "\n";
+ s->commits[i].from = rfrom;
+ }
+ for (size_t j = 0; j < s->commits[i].merges.size(); j++) {
+ if (s->commits[i].merges[j] == rish) {
+ std::cout << *r_it << " removal: updating merge commit for
" << s->commits[i].id.sha1 << "\n";
+ s->commits[i].merges[j] = rfrom;
+ }
+ }
+ }
+}
+
+return 0;
+}
+
+int
git_map_emails(git_fi_data *s, std::string _map)
{
// read map
@@ -995,6 +1064,7 @@
bool collapse_notes = false;
bool wrap_commit_lines = false;
bool trim_whitespace = false;
+bool list_empty = false;
std::string repo_path;
std::string email_map;
std::string svn_map;
@@ -1001,6 +1071,7 @@
std::string svn_rev_map;
std::string svn_branch_map;
std::string svn_branches_to_tags;
+std::string remove_commits;
std::string correct_branches;
std::string cvs_auth_map;
std::string cvs_branch_map;
@@ -1022,6 +1093,7 @@
("svn-branches", "Specify [git sha1|rev] -> svn branch (one mapping
per line, format is key:[branch;branch])",
cxxopts::value>(), "map file")
("svn-branches-to-tags", "Specify git sha1 list that was committed
to tags, not branches", cxxopts::value>(), "sha1 list")
("correct-branches", "Specify rev -> branch sets
(key;[branch;branch]. Will override svn-branches assignments.)",
cxxopts::value>(), "map")
+ ("remove-commits", "Specify sha1 list of commits to remove from
history", cxxopts::value>(), "list_file")
("cvs-auth-map", "msg -> cvs author map (needs sha1->key
map)", cxxopts::value>(), "file")
[brlcad-commits] SF.net SVN: brlcad:[78314] brlcad/trunk/misc/repoconv/sha1_update.sh
Revision: 78314
http://sourceforge.net/p/brlcad/code/78314
Author: starseeker
Date: 2021-02-23 19:26:17 + (Tue, 23 Feb 2021)
Log Message:
---
Support either ; or : as delimiters
Modified Paths:
--
brlcad/trunk/misc/repoconv/sha1_update.sh
Modified: brlcad/trunk/misc/repoconv/sha1_update.sh
===
--- brlcad/trunk/misc/repoconv/sha1_update.sh 2021-02-23 19:11:34 UTC (rev
78313)
+++ brlcad/trunk/misc/repoconv/sha1_update.sh 2021-02-23 19:26:17 UTC (rev
78314)
@@ -44,7 +44,7 @@
rm -f sha1s_orig ukeys nkeys mapped_keys map.sed
while read p; do
- SHA1=$(echo "$p" | awk -F';' '{print $1}')
+ SHA1=$(echo "$p" | awk -F'[;:]' '{print $1}')
if [ "$SHA1" != "" ]
then
echo $SHA1 >> $CWD/sha1s_orig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78313] brlcad/trunk/misc
Revision: 78313
http://sourceforge.net/p/brlcad/code/78313
Author: starseeker
Date: 2021-02-23 19:11:34 + (Tue, 23 Feb 2021)
Log Message:
---
Rename - test updates using script succeeded.
To test the efficacy of this script, one of the updating
files to the conversion was altered to remove one of the
earliest correction lines, and that line was applied in
isolation to create a new repository with most of the
SHA1 ids altered. The original repository and the
altered repository were then used to update the full input
files (minus the already applied line) by mapping the
original SHA1 keys to the corresponding new keys. After
application of the altered files, the final git log --all
log from the resulting repository was compared to the
equivalent log generated from the repository created by
applying the original files to the original input. The logs
were identical, which means all the mapping were successfully
made and the equivalent changes successfully applied.
Modified Paths:
--
brlcad/trunk/misc/CMakeLists.txt
Added Paths:
---
brlcad/trunk/misc/repoconv/sha1_update.sh
Removed Paths:
-
brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Modified: brlcad/trunk/misc/CMakeLists.txt
===
--- brlcad/trunk/misc/CMakeLists.txt2021-02-23 18:15:34 UTC (rev 78312)
+++ brlcad/trunk/misc/CMakeLists.txt2021-02-23 19:11:34 UTC (rev 78313)
@@ -215,7 +215,7 @@
repoconv/manual_merge_info.tar.gz
repoconv/md5.hpp
repoconv/sha1.hpp
- repoconv/sha1_to_uniqkey.sh
+ repoconv/sha1_update.sh
repoconv/svn2git/README
repoconv/svn2git/archive_branches.sh
repoconv/svn2git/rules
Deleted: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
===
--- brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 18:15:34 UTC
(rev 78312)
+++ brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 19:11:34 UTC
(rev 78313)
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CWD=$(pwd)
-
-if [ "$#" -ne "4" ]
-then
- echo "sha1_update old_repo new_repo input_file output_file"
- exit 1
-fi
-old_repo=$1
-new_repo=$2
-input_file=$CWD/$3
-output_file=$4
-
-if [ ! -d $old_repo ]
-then
- echo "$old_repo does not exist"
- exit 1
-fi
-if [ ! -d $new_repo ]
-then
- echo "$new_repo does not exist"
- exit 1
-fi
-if [ ! -f $input_file ]
-then
- input_file=$3
- if [ ! -f $input_file ]
- then
- echo "$input_file does not exist"
- exit 1
- fi
-fi
-if [ -f $output_file ]
-then
- echo "$output_file already exists"
- exit 1
-fi
-
-
-cd $old_repo
-
-rm -f sha1s_orig ukeys nkeys mapped_keys map.sed
-while read p; do
- SHA1=$(echo "$p" | awk -F';' '{print $1}')
- if [ "$SHA1" != "" ]
- then
- echo $SHA1 >> $CWD/sha1s_orig
-
- TSMP=$(git log -1 --pretty=format:"%ct%n" $SHA1)
-
- # https://stackoverflow.com/a/7132381
- git branch -a --contains $SHA1 | grep -v remote | sort | uniq |sed -e
's/\*//'|sed -e 's/ //g' > $CWD/branchtmp
- BMD5=$(md5sum $CWD/branchtmp |awk '{print $1}')
- rm $CWD/branchtmp
-
- git diff --raw $SHA1^ $SHA1 > $CWD/keytmp
- DIFFKEY=$(md5sum $CWD/keytmp |awk '{print $1}')
- rm $CWD/keytmp
-
- echo "SHA1: $SHA1"
- echo "Timestamp: $TSMP"
- echo "Branches MD5: $BMD5"
- echo "Diff MD5: $DIFFKEY"
- echo "$SHA1;$TSMP;$BMD5;$DIFFKEY" >> $CWD/ukeys
- fi
-done < $input_file
-echo "" >> $CWD/ukeys
-
-cd $new_repo
-
-echo ""
-echo "Mapping from $old_repo SHA1 keys to $new_repo SHA1 keys:"
-echo ""
-
-while read p; do
- OSHA1=$(echo "$p" | awk -F';' '{print $1}')
- TSMP=$(echo "$p" | awk -F';' '{print $2}')
- BMD5=$(echo "$p" | awk -F';' '{print $3}')
- DIFFKEY=$(echo "$p" | awk -F';' '{print $4}')
- pwd
- echo "Searching for: $TSMP $BMD5 $DIFFKEY"
- git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > $CWD/nkeys
- echo "" >> $CWD/nkeys
- while read d; do
- CSHA1=$d
- echo "CSHA1: $CSHA1"
-
- git branch -a --contains $CSHA1 | grep -v remote | sort | uniq |sed
-e 's/\*//'|sed -e 's/ //g' > $CWD/branchtmp
- NBMD5=$(md5sum $CWD/branchtmp |awk '{print $1}')
- echo "NBMD5: $NBMD5"
- rm $CWD/branchtmp
-
- if [ "$BMD5" == "$NBMD5" ]
- then
- git diff --raw $CSHA1^ $CSHA1 > $CWD/keytmp
- NDIFFKEY=$(md5sum $CWD/keytmp |awk '{print $1}')
- echo "NDIFFKEY: $NDIFFKEY"
- if [ "$NDIFFKEY" == "$DIFFKEY" ]
- then
- echo "MATCH"
- echo "s/$OSHA1/$d/g" >> $CWD/map.sed
- fi
- rm $CWD/keytmp
- fi
- done < $CWD/nkeys
- rm $CWD/nkeys
-done < $CWD/ukeys
-
-cd
[brlcad-commits] SF.net SVN: brlcad:[78312] brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Revision: 78312
http://sourceforge.net/p/brlcad/code/78312
Author: starseeker
Date: 2021-02-23 18:15:34 + (Tue, 23 Feb 2021)
Log Message:
---
Write out a sed script for the matches and apply it to the output file.
Modified Paths:
--
brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Modified: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
===
--- brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 16:50:58 UTC
(rev 78311)
+++ brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 18:15:34 UTC
(rev 78312)
@@ -42,7 +42,7 @@
cd $old_repo
-rm -f sha1s_orig ukeys nkeys mapped_keys
+rm -f sha1s_orig ukeys nkeys mapped_keys map.sed
while read p; do
SHA1=$(echo "$p" | awk -F';' '{print $1}')
if [ "$SHA1" != "" ]
@@ -64,10 +64,10 @@
echo "Timestamp: $TSMP"
echo "Branches MD5: $BMD5"
echo "Diff MD5: $DIFFKEY"
- echo "$TSMP;$BMD5;$DIFFKEY" >> $CWD/ukeys
+ echo "$SHA1;$TSMP;$BMD5;$DIFFKEY" >> $CWD/ukeys
fi
- echo "" >> $CWD/ukeys
done < $input_file
+echo "" >> $CWD/ukeys
cd $new_repo
@@ -76,9 +76,10 @@
echo ""
while read p; do
- TSMP=$(echo "$p" | awk -F';' '{print $1}')
- BMD5=$(echo "$p" | awk -F';' '{print $2}')
- DIFFKEY=$(echo "$p" | awk -F';' '{print $3}')
+ OSHA1=$(echo "$p" | awk -F';' '{print $1}')
+ TSMP=$(echo "$p" | awk -F';' '{print $2}')
+ BMD5=$(echo "$p" | awk -F';' '{print $3}')
+ DIFFKEY=$(echo "$p" | awk -F';' '{print $4}')
pwd
echo "Searching for: $TSMP $BMD5 $DIFFKEY"
git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > $CWD/nkeys
@@ -100,7 +101,7 @@
if [ "$NDIFFKEY" == "$DIFFKEY" ]
then
echo "MATCH"
- echo $d >> $CWD/mapped_keys
+ echo "s/$OSHA1/$d/g" >> $CWD/map.sed
fi
rm $CWD/keytmp
fi
@@ -109,3 +110,6 @@
done < $CWD/ukeys
cd $CWD
+cp $input_file $output_file
+sed -i -f map.sed $output_file
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78311] brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Revision: 78311
http://sourceforge.net/p/brlcad/code/78311
Author: starseeker
Date: 2021-02-23 16:50:58 + (Tue, 23 Feb 2021)
Log Message:
---
Start forming script into something that can process a file...
Modified Paths:
--
brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Modified: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
===
--- brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 16:07:16 UTC
(rev 78310)
+++ brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 16:50:58 UTC
(rev 78311)
@@ -1,32 +1,78 @@
#!/bin/bash
+
+set -e
+
+CWD=$(pwd)
+
+if [ "$#" -ne "4" ]
+then
+ echo "sha1_update old_repo new_repo input_file output_file"
+ exit 1
+fi
+old_repo=$1
+new_repo=$2
+input_file=$CWD/$3
+output_file=$4
+
+if [ ! -d $old_repo ]
+then
+ echo "$old_repo does not exist"
+ exit 1
+fi
+if [ ! -d $new_repo ]
+then
+ echo "$new_repo does not exist"
+ exit 1
+fi
+if [ ! -f $input_file ]
+then
+ input_file=$3
+ if [ ! -f $input_file ]
+ then
+ echo "$input_file does not exist"
+ exit 1
+ fi
+fi
+if [ -f $output_file ]
+then
+ echo "$output_file already exists"
+ exit 1
+fi
+
+
+cd $old_repo
+
rm -f sha1s_orig ukeys nkeys mapped_keys
while read p; do
SHA1=$(echo "$p" | awk -F';' '{print $1}')
if [ "$SHA1" != "" ]
then
- echo $SHA1 >> sha1s_orig
+ echo $SHA1 >> $CWD/sha1s_orig
TSMP=$(git log -1 --pretty=format:"%ct%n" $SHA1)
# https://stackoverflow.com/a/7132381
- git branch -a --contains $SHA1 | grep -v remote | sort | uniq |sed -e
's/\*//'|sed -e 's/ //g' > branchtmp
- BMD5=$(md5sum branchtmp |awk '{print $1}')
- rm branchtmp
+ git branch -a --contains $SHA1 | grep -v remote | sort | uniq |sed -e
's/\*//'|sed -e 's/ //g' > $CWD/branchtmp
+ BMD5=$(md5sum $CWD/branchtmp |awk '{print $1}')
+ rm $CWD/branchtmp
- git diff --raw $SHA1^ $SHA1 > keytmp
- DIFFKEY=$(md5sum keytmp |awk '{print $1}')
- rm keytmp
+ git diff --raw $SHA1^ $SHA1 > $CWD/keytmp
+ DIFFKEY=$(md5sum $CWD/keytmp |awk '{print $1}')
+ rm $CWD/keytmp
echo "SHA1: $SHA1"
echo "Timestamp: $TSMP"
echo "Branches MD5: $BMD5"
echo "Diff MD5: $DIFFKEY"
- echo "$TSMP;$BMD5;$DIFFKEY" >> ukeys
+ echo "$TSMP;$BMD5;$DIFFKEY" >> $CWD/ukeys
fi
-done < $1
+ echo "" >> $CWD/ukeys
+done < $input_file
+cd $new_repo
+
echo ""
-echo "Remapping:"
+echo "Mapping from $old_repo SHA1 keys to $new_repo SHA1 keys:"
echo ""
while read p; do
@@ -33,33 +79,33 @@
TSMP=$(echo "$p" | awk -F';' '{print $1}')
BMD5=$(echo "$p" | awk -F';' '{print $2}')
DIFFKEY=$(echo "$p" | awk -F';' '{print $3}')
+ pwd
echo "Searching for: $TSMP $BMD5 $DIFFKEY"
- git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > nkeys
- echo "" >> nkeys
- echo "nkeys:"
- cat nkeys
- echo ""
+ git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > $CWD/nkeys
+ echo "" >> $CWD/nkeys
while read d; do
CSHA1=$d
echo "CSHA1: $CSHA1"
- git branch -a --contains $CSHA1 | grep -v remote | sort | uniq |sed
-e 's/\*//'|sed -e 's/ //g' > branchtmp
- NBMD5=$(md5sum branchtmp |awk '{print $1}')
+ git branch -a --contains $CSHA1 | grep -v remote | sort | uniq |sed
-e 's/\*//'|sed -e 's/ //g' > $CWD/branchtmp
+ NBMD5=$(md5sum $CWD/branchtmp |awk '{print $1}')
echo "NBMD5: $NBMD5"
- rm branchtmp
+ rm $CWD/branchtmp
if [ "$BMD5" == "$NBMD5" ]
then
- git diff --raw $CSHA1^ $CSHA1 > keytmp
- NDIFFKEY=$(md5sum keytmp |awk '{print $1}')
+ git diff --raw $CSHA1^ $CSHA1 > $CWD/keytmp
+ NDIFFKEY=$(md5sum $CWD/keytmp |awk '{print $1}')
echo "NDIFFKEY: $NDIFFKEY"
if [ "$NDIFFKEY" == "$DIFFKEY" ]
then
echo "MATCH"
- echo $d >> mapped_keys
+ echo $d >> $CWD/mapped_keys
fi
- rm keytmp
+ rm $CWD/keytmp
fi
- done < nkeys
- rm nkeys
-done < ukeys
+ done < $CWD/nkeys
+ rm $CWD/nkeys
+done < $CWD/ukeys
+
+cd $CWD
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78310] brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Revision: 78310
http://sourceforge.net/p/brlcad/code/78310
Author: starseeker
Date: 2021-02-23 16:07:16 + (Tue, 23 Feb 2021)
Log Message:
---
Use the branch structure as well in this comparison - it's conceivable
timestamp and diff contents match but the branch inclusions don't.
Modified Paths:
--
brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Modified: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
===
--- brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 15:13:59 UTC
(rev 78309)
+++ brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 16:07:16 UTC
(rev 78310)
@@ -4,15 +4,24 @@
SHA1=$(echo "$p" | awk -F';' '{print $1}')
if [ "$SHA1" != "" ]
then
- echo "SHA1: $SHA1"
echo $SHA1 >> sha1s_orig
+
TSMP=$(git log -1 --pretty=format:"%ct%n" $SHA1)
- echo "Timestamp: $TSMP"
+
+ # https://stackoverflow.com/a/7132381
+ git branch -a --contains $SHA1 | grep -v remote | sort | uniq |sed -e
's/\*//'|sed -e 's/ //g' > branchtmp
+ BMD5=$(md5sum branchtmp |awk '{print $1}')
+ rm branchtmp
+
git diff --raw $SHA1^ $SHA1 > keytmp
DIFFKEY=$(md5sum keytmp |awk '{print $1}')
rm keytmp
- echo "Diffkey: $DIFFKEY"
- echo "$TSMP;$DIFFKEY" >> ukeys
+
+ echo "SHA1: $SHA1"
+ echo "Timestamp: $TSMP"
+ echo "Branches MD5: $BMD5"
+ echo "Diff MD5: $DIFFKEY"
+ echo "$TSMP;$BMD5;$DIFFKEY" >> ukeys
fi
done < $1
@@ -22,8 +31,9 @@
while read p; do
TSMP=$(echo "$p" | awk -F';' '{print $1}')
- DIFFKEY=$(echo "$p" | awk -F';' '{print $2}')
- echo "$p -> $TSMP $DIFFKEY"
+ BMD5=$(echo "$p" | awk -F';' '{print $2}')
+ DIFFKEY=$(echo "$p" | awk -F';' '{print $3}')
+ echo "Searching for: $TSMP $BMD5 $DIFFKEY"
git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > nkeys
echo "" >> nkeys
echo "nkeys:"
@@ -32,15 +42,24 @@
while read d; do
CSHA1=$d
echo "CSHA1: $CSHA1"
- git diff --raw $CSHA1^ $CSHA1 > keytmp
- NDIFFKEY=$(md5sum keytmp |awk '{print $1}')
- echo "NDIFFKEY: $NDIFFKEY"
- if [ "$NDIFFKEY" == "$DIFFKEY" ]
+
+ git branch -a --contains $CSHA1 | grep -v remote | sort | uniq |sed
-e 's/\*//'|sed -e 's/ //g' > branchtmp
+ NBMD5=$(md5sum branchtmp |awk '{print $1}')
+ echo "NBMD5: $NBMD5"
+ rm branchtmp
+
+ if [ "$BMD5" == "$NBMD5" ]
then
- echo "MATCH"
- echo $d >> mapped_keys
+ git diff --raw $CSHA1^ $CSHA1 > keytmp
+ NDIFFKEY=$(md5sum keytmp |awk '{print $1}')
+ echo "NDIFFKEY: $NDIFFKEY"
+ if [ "$NDIFFKEY" == "$DIFFKEY" ]
+ then
+ echo "MATCH"
+ echo $d >> mapped_keys
+ fi
+ rm keytmp
fi
- rm keytmp
done < nkeys
rm nkeys
done < ukeys
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78309] brlcad/trunk/misc
Revision: 78309
http://sourceforge.net/p/brlcad/code/78309
Author: starseeker
Date: 2021-02-23 15:13:59 + (Tue, 23 Feb 2021)
Log Message:
---
Hopefully it won't be necessary, but if it is - start figuring out how to remap
the SHA1 keys in the various custom files from an old repo to a new.
Modified Paths:
--
brlcad/trunk/misc/CMakeLists.txt
Added Paths:
---
brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
Modified: brlcad/trunk/misc/CMakeLists.txt
===
--- brlcad/trunk/misc/CMakeLists.txt2021-02-23 13:46:34 UTC (rev 78308)
+++ brlcad/trunk/misc/CMakeLists.txt2021-02-23 15:13:59 UTC (rev 78309)
@@ -215,6 +215,7 @@
repoconv/manual_merge_info.tar.gz
repoconv/md5.hpp
repoconv/sha1.hpp
+ repoconv/sha1_to_uniqkey.sh
repoconv/svn2git/README
repoconv/svn2git/archive_branches.sh
repoconv/svn2git/rules
Added: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
===
--- brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh 2021-02-23 15:13:59 UTC
(rev 78309)
@@ -0,0 +1,46 @@
+#!/bin/bash
+rm -f sha1s_orig ukeys nkeys mapped_keys
+while read p; do
+ SHA1=$(echo "$p" | awk -F';' '{print $1}')
+ if [ "$SHA1" != "" ]
+ then
+ echo "SHA1: $SHA1"
+ echo $SHA1 >> sha1s_orig
+ TSMP=$(git log -1 --pretty=format:"%ct%n" $SHA1)
+ echo "Timestamp: $TSMP"
+ git diff --raw $SHA1^ $SHA1 > keytmp
+ DIFFKEY=$(md5sum keytmp |awk '{print $1}')
+ rm keytmp
+ echo "Diffkey: $DIFFKEY"
+ echo "$TSMP;$DIFFKEY" >> ukeys
+ fi
+done < $1
+
+echo ""
+echo "Remapping:"
+echo ""
+
+while read p; do
+ TSMP=$(echo "$p" | awk -F';' '{print $1}')
+ DIFFKEY=$(echo "$p" | awk -F';' '{print $2}')
+ echo "$p -> $TSMP $DIFFKEY"
+ git log --all --since $TSMP --until $TSMP --pretty=format:"%H" > nkeys
+ echo "" >> nkeys
+ echo "nkeys:"
+ cat nkeys
+ echo ""
+ while read d; do
+ CSHA1=$d
+ echo "CSHA1: $CSHA1"
+ git diff --raw $CSHA1^ $CSHA1 > keytmp
+ NDIFFKEY=$(md5sum keytmp |awk '{print $1}')
+ echo "NDIFFKEY: $NDIFFKEY"
+ if [ "$NDIFFKEY" == "$DIFFKEY" ]
+ then
+ echo "MATCH"
+ echo $d >> mapped_keys
+ fi
+ rm keytmp
+ done < nkeys
+ rm nkeys
+done < ukeys
Property changes on: brlcad/trunk/misc/repoconv/sha1_to_uniqkey.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78308] brlcad/trunk/misc/repoconv/NOTES
Revision: 78308 http://sourceforge.net/p/brlcad/code/78308 Author: starseeker Date: 2021-02-23 13:46:34 + (Tue, 23 Feb 2021) Log Message: --- Note trivial but typing saving scripts to use for querying local SVN copy of repo. Modified Paths: -- brlcad/trunk/misc/repoconv/NOTES Modified: brlcad/trunk/misc/repoconv/NOTES === --- brlcad/trunk/misc/repoconv/NOTES2021-02-23 13:30:17 UTC (rev 78307) +++ brlcad/trunk/misc/repoconv/NOTES2021-02-23 13:46:34 UTC (rev 78308) @@ -350,4 +350,20 @@ but it would mean re-keying all of the information in those files to a new set of SHA1 keys manually... +### +Handy scripts for getting local svn info quickly: +List files associated with a commit, either from a specific branch or the +whole of the repo: +#!/bin/bash +if [ "$#" -eq 2 ]; then +svn diff -c$1 file:///home/user/brlcad_repo/brlcad/branches/$2|grep ^Index +fi +if [ "$#" -eq 1 ]; then +svn diff -c$1 file:///home/user/brlcad_repo/brlcad|grep ^Index +fi + +Get log message associated with a commit: +#!/bin/bash +svn log -c$1 file:///home/user/brlcad_repo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78307] brlcad/trunk/misc/repoconv/NOTES
Revision: 78307 http://sourceforge.net/p/brlcad/code/78307 Author: starseeker Date: 2021-02-23 13:30:17 + (Tue, 23 Feb 2021) Log Message: --- Explain why some of the files are keyed the way they are... Modified Paths: -- brlcad/trunk/misc/repoconv/NOTES Modified: brlcad/trunk/misc/repoconv/NOTES === --- brlcad/trunk/misc/repoconv/NOTES2021-02-22 20:07:17 UTC (rev 78306) +++ brlcad/trunk/misc/repoconv/NOTES2021-02-23 13:30:17 UTC (rev 78307) @@ -331,3 +331,23 @@ http://esr.ibiblio.org/?p=8607 https://gitlab.com/ideasman42/blender-git-migration/ + + +Note: The files svn_rev_updates.txt, tag_commits.txt, and branch_corrections.txt +assume a repository produced by the version of repowork at SVN r76568 (i.e. +their sha1 keys assume the output produced by the following options at that +version - newer versions have a processing difference that's not been fixed yet +that doesn't keep the line between the message and the footer): + +./repowork -t -e email_fixups.txt \ +-n -r cvs_git \ +-s rev_map \ +--keymap msgtime_sha1_map --cvs-auth-map key_authormap --cvs-branch-map key_branchmap \ +brlcad_raw.fi brlcad_final.fi + +This setup isn't ideal: between needing the older revision and the cvs branch +map assignments setting their incorrect info... Ideally we would just skip them, +but it would mean re-keying all of the information in those files to a new set of +SHA1 keys manually... + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78306] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78306 http://sourceforge.net/p/brlcad/code/78306 Author: starseeker Date: 2021-02-22 20:07:17 + (Mon, 22 Feb 2021) Log Message: --- set branch to trunk for r5208 Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 18:38:45 UTC (rev 78305) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 20:07:17 UTC (rev 78306) @@ -241,3 +241,5 @@ 4e708577f63300e8aaa93eaaf1129da8b0a41c62:dmtogl-branch c0737a9252506872ce5ce6cd14207f7c375741da:dmtogl-branch +885ed4c94ec0131f2cba48ffcbb3d0e03e4ecefd:trunk + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78305] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78305 http://sourceforge.net/p/brlcad/code/78305 Author: starseeker Date: 2021-02-22 18:38:45 + (Mon, 22 Feb 2021) Log Message: --- Make sure these commits are dmtogl-branch Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 14:31:58 UTC (rev 78304) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 18:38:45 UTC (rev 78305) @@ -234,3 +234,10 @@ 4aac0a9a29752528a36e4882da812857da5e1c6e:rel-5-1-patches eb4b12d2baecffdc33a56ba89b29d611395b8f3d:trunk + +8c18fd5b69faae7bd2a044483b221cbdd44c0423:dmtogl-branch +b7d068814c202e53677946dc219b4ffd654362ac:dmtogl-branch +eade42f1b43b8dc322129653eb9899f982f5e2bd:dmtogl-branch +4e708577f63300e8aaa93eaaf1129da8b0a41c62:dmtogl-branch +c0737a9252506872ce5ce6cd14207f7c375741da:dmtogl-branch + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78304] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78304 http://sourceforge.net/p/brlcad/code/78304 Author: starseeker Date: 2021-02-22 14:31:58 + (Mon, 22 Feb 2021) Log Message: --- Whoops, don't use semicolons here. Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 14:29:43 UTC (rev 78303) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 14:31:58 UTC (rev 78304) @@ -232,5 +232,5 @@ 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.7.1 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.9.1 -4aac0a9a29752528a36e4882da812857da5e1c6e;rel-5-1-patches -eb4b12d2baecffdc33a56ba89b29d611395b8f3d;trunk +4aac0a9a29752528a36e4882da812857da5e1c6e:rel-5-1-patches +eb4b12d2baecffdc33a56ba89b29d611395b8f3d:trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78303] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78303
http://sourceforge.net/p/brlcad/code/78303
Author: starseeker
Date: 2021-02-22 14:29:43 + (Mon, 22 Feb 2021)
Log Message:
---
Need to skip label if the rev is < 0
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 14:21:23 UTC (rev
78302)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 14:29:43 UTC (rev
78303)
@@ -198,11 +198,13 @@
long nrev = rmap[s->commits[i].id.sha1];
s->commits[i].svn_id = nrev;
- std::cout << "Assigning new SVN rev " << nrev << " to " <<
s->commits[i].id.sha1 << "\n";
+ if (nrev > 0) {
+ std::cout << "Assigning new SVN rev " << nrev << " to " <<
s->commits[i].id.sha1 << "\n";
- // Note: this isn't guaranteed to be unique... setting it mostly for
- // the cases where it is.
- s->rev_to_sha1[s->commits[i].svn_id] = s->commits[i].id.sha1;
+ // Note: this isn't guaranteed to be unique... setting it mostly
for
+ // the cases where it is.
+ s->rev_to_sha1[s->commits[i].svn_id] = s->commits[i].id.sha1;
+ }
// Update the message
std::stringstream ss(s->commits[i].commit_msg);
@@ -242,9 +244,11 @@
// the existing one, inserting a new line before the
// current non-revision svn line, or skipping if the
// nrev value is -1.
- std::string nrevline = std::string("svn:revision:") +
std::to_string(nrev);
- nmsg.append(nrevline);
- nmsg.append("\n");
+ if (nrev > 0) {
+ std::string nrevline = std::string("svn:revision:") +
std::to_string(nrev);
+ nmsg.append(nrevline);
+ nmsg.append("\n");
+ }
// Any further svn:revision lines will be skipped - for
// now at least, one to a commit.
srev = true;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78302] brlcad/trunk/misc/repoconv
Revision: 78302 http://sourceforge.net/p/brlcad/code/78302 Author: starseeker Date: 2021-02-22 14:21:23 + (Mon, 22 Feb 2021) Log Message: --- Corrections for 19755 Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 04:00:21 UTC (rev 78301) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 14:21:23 UTC (rev 78302) @@ -232,4 +232,5 @@ 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.7.1 68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.9.1 - +4aac0a9a29752528a36e4882da812857da5e1c6e;rel-5-1-patches +eb4b12d2baecffdc33a56ba89b29d611395b8f3d;trunk Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-22 04:00:21 UTC (rev 78301) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-22 14:21:23 UTC (rev 78302) @@ -1,6 +1,7 @@ 771b3183f9e315f6e1451a1e3462e6f84724a9cd;735 + eb4b12d2baecffdc33a56ba89b29d611395b8f3d;19755 - +4aac0a9a29752528a36e4882da812857da5e1c6e;19755 2788b39fe6de7e5fbfcdc30b9c38e2a15b69bf63;21635 050bedc3065ed5b051958343bae465c2823ad29e;21635 0d7ec74a6b6056eafeac1cec2d8f749ac5a2a58f;22217 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78301] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78301 http://sourceforge.net/p/brlcad/code/78301 Author: starseeker Date: 2021-02-22 04:00:21 + (Mon, 22 Feb 2021) Log Message: --- whoops, wrong sha1 Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 03:46:57 UTC (rev 78300) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 04:00:21 UTC (rev 78301) @@ -218,18 +218,18 @@ e4c97aa291ec4b5bf6d9bd3abca27da12fb108f9:unlabeled-2.5.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-11.1.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-2.12.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.10.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.12.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.1.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.2.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.1.2 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.1.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.2.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-2.6.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.3.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.7.1 -9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.9.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-11.1.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-2.12.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.10.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.12.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-1.1.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-1.2.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-1.1.2 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.1.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.2.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-2.6.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.3.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.7.1 +68aeb784b3ee698c854878c190eb4b229b88e1fe:unlabeled-9.9.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78300] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78300 http://sourceforge.net/p/brlcad/code/78300 Author: starseeker Date: 2021-02-22 03:46:57 + (Mon, 22 Feb 2021) Log Message: --- Add r30688 branches Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 03:46:10 UTC (rev 78299) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 03:46:57 UTC (rev 78300) @@ -218,5 +218,18 @@ e4c97aa291ec4b5bf6d9bd3abca27da12fb108f9:unlabeled-2.5.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-11.1.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-2.12.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.10.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.12.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.1.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.2.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-1.1.2 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.1.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.2.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-2.6.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.3.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.7.1 +9c2d78936b3eb62bfa0f0652c801399398422f38:unlabeled-9.9.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78299] brlcad/trunk/misc/repoconv/ branch_corrections.txt
Revision: 78299 http://sourceforge.net/p/brlcad/code/78299 Author: starseeker Date: 2021-02-22 03:46:10 + (Mon, 22 Feb 2021) Log Message: --- correct form of branch_corrections Modified Paths: -- brlcad/trunk/misc/repoconv/branch_corrections.txt Modified: brlcad/trunk/misc/repoconv/branch_corrections.txt === --- brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 03:28:31 UTC (rev 78298) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 03:46:10 UTC (rev 78299) @@ -1,222 +1,222 @@ -8694a7bbb92edf8052bc2e32e7a61a923f1c7b85;trunk -b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.12.1 -b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.6.1 -e75443d252e4607c696c43e3da0caf641503d5a4;unlabeled-1.1.1 -60b5d4808dd43118375c08d6ebf8067a97b96c86;trunk -2c40428b7a1a989174df43b66fd00d9d960487bc;rel-5-1-branch -c365a032935f99d5cbcc5e0b7316253e918183f5;rel-5-1-branch -aec4367dafd37a7b0657c4b27414caa21ac4c1be;trunk -6468a861687abce96f1b988cf66cd9c3d183bbd5;trunk -0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;rel-5-1-branch -2ec20a87d6e216cc3af62da933a2917e96459ce2;rel-5-1-branch -7678e03883c0e09c063c6f7fecbaef5db50c4619;trunk -7a6b91272d804146e40be69cf1b197a02b7f9869;trunk -4d5fe4e8afa57a275c04f0a11cbf20c1378ce600;rel-5-1-branch -6dc89feeeaad3ab3ffcc6e122698ab51e666201a;trunk -4af5f01acc93a65ba8e158c1e407e6fa30f0a867;rel-5-1-branch -0e0ad86faa75124a20fd58a7c5952eef7dd2949b;trunk -86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;rel-5-1-branch -9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch -c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk -9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch -c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk -70f24c0838458564139cdd749b40ce0777ae6b74;trunk -3312597ec11da607ad8cdecb8e86ecd6cd43a21c;rel-5-1-branch -57dbefec33f8aeb13c9e99690a745660737ff02c;trunk -5db99eba906095eb11b3ea893b95301ba9d4;rel-5-1-branch -ea6d4c16bae6ecf30d4439d92c8dd72f56b3e942;rel-5-1-branch -4d401a8617869d3594b5948de12a374a5bd292fe;trunk -af33297408e4ec0b38fa37d211104ae8e3f4b850;rel-5-1-branch -e4c7c2c443b62ca5ab8dbfdd4347724d165c0837;trunk -c319e54f04de0b452a81fd7b2dcecbbfeb267821;trunk -b11b50a4a522208ece0ca8aa09f493e68184c065;rel-5-1-branch -115a366383216585cfcceb0edf36f3effca0f7d0;trunk -d9306778a6714c198a0b4385f57a1b7afbd4c3fc;rel-5-1-branch -cf3ac3a4bd09919521f655bc3e6f347881f89bef;trunk -9db0bcb131b8805c060ef2b35f30433d5f2d16ee;rel-5-1-branch -9fe24bec5d28fa14f9a2cf825a52a7f2adb0915a;trunk -561e8385b4f2bd30665991d6179e6702fb601cf1;rel-5-1-branch -81e183c4aa743cb002f77ce885b8a971d2a687bc;trunk -51a2d8caf35c0512efda85b11bf9a2c858ff0e77;rel-5-1-branch -3a6fdd142e59c7fee7dfb06fdaecc3b30f28d633;rel-5-1-branch -fa4138d198944ad67f26e77f6552361b87938b1a;trunk -a53d24a82016e59e54ad3fa0750238b077313a33;rel-5-1-branch -7b4f169aec730a81b5ce863648a8ae31819b97d1;trunk -c0d54d270fc0e426e99ccd42bdc95d97df888e7d;trunk -24d99686c39438784e16e393feeb2c0d4572820a;rel-5-1-branch -5d42e0a4c6542c0d0a23bfd14844f7cf9130b557;trunk -4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;rel-5-1-branch -28ceac2b857dccc8395a08a05f426badc2654b82;trunk -b334467bc02e858e5ad01f18565c740b8458b858;rel-5-1-branch -9a61489cbe78e69178e64760f3b881d292a975e4;trunk -13c8395e91b708bb045ad34da6bf52459e254287;rel-5-1-branch -0529b166dfa7dec9df728627ca1232a342f97b52;trunk -71b6b0a21675828fb10df69a83f96988abf0021a;rel-5-1-branch -5aeffe61fc5a22793e96d4b204da3688526a7c36;trunk -e974d0e833a02b40de938a22184c06e2ee9e0453;rel-5-1-branch -477bfa6c19ff8757b182f5c32bffbe0af1135f98;trunk -39b75b2eb605ab9cbe6364622a0bc32ba32f74dd;rel-5-1-branch -348729921527d5e7f2e66c509615d6879711d4d6;trunk -13dd9624b6aaf03a26c400c34494320b4223b91f;rel-5-1-branch -077a8d2fbf94e0f86edb2c4ea1bb0e134757d8e3;trunk -023369fd1ba2c63ef2a0fc973ad0283973033946;rel-5-1-branch -f1dc6d42b2b62013b7c83692922962d5a52c302c;rel-5-1-patches -4872d826a29325f265d21ced8efb5e2dfae3131a;rel-5-1-branch -aa525c3e31418766749334390ac8ca367ff99a5d;trunk -c17ba8ddea5915f8c2c535cf121ff313c2c4d294;rel-5-1-branch -e7b35bb9858eca26a412c02071b7a25cabee76ee;trunk -7ec21b4816510812a9a9ca0fd0c712bcfc5527f8;rel-5-1-branch -f1c200f10e9d5c0f896508b2967f644abafad234;rel-5-1-branch -e9452d6fd0dadb1192d99777acf891b0bc7703bb;trunk -45a67834524348e32e2c1d34071b59dbb1360d9e;rel-5-1-branch -fb7437f02dde3953bb257548c453724ad1af30db;trunk -381e3b2e2bc8807615ae11a06ec8e4eb89509f6c;trunk -2b82299887068d18e9eeab288a825dce0603b29c;rel-5-1-branch -e81140fba764449e55241b4d5b79a0a9be103015;trunk -03ef287c9f854dcb2c5bad5bdecea2625e7f8bc3;rel-5-1-branch -f03e7005f7c458ee96694b12e457ac03b183c6ff;trunk -b963ebd8d5c178f27c322c70b9dfd692f9a71640;rel-5-1-branch -c4a48334f3efdd8ae641d1d943f253c8659cda69;trunk -1575b390eaee5f8a22aa24e45879beec0b92f223;rel-5-1-branch -92965698f84c2ba5fd8ed9a3a5bd1b59076088b1;trunk -b685aafbfa677f91822bf9fff3566efe28533c84;rel-5-1-branch
[brlcad-commits] SF.net SVN: brlcad:[78298] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78298
http://sourceforge.net/p/brlcad/code/78298
Author: starseeker
Date: 2021-02-22 03:28:31 + (Mon, 22 Feb 2021)
Log Message:
---
Checkpoint work reorganizing message updating steps into distinct stages. Need
to check no bugs were introduced and the new form of the logic does what we
need/want.
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 03:09:25 UTC (rev
78297)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 03:28:31 UTC (rev
78298)
@@ -146,23 +146,14 @@
return 0;
}
-// TODO: need to change how we're doing this. Need multiple passes:
-//
-// 1. Assign SVN commit numbers
-// 2. SVN branch->tag label updates
-// 3. General SVN revs->branches update
-// 4. Specific CVS era SVN branch assignment corrections (for when we can peg
specific Git commits to specific SVN branches.)
+// This is the first step of the note correction process - run it first
int
-git_update_svnnotes(git_fi_data *s,
- std::string _rev_map, std::string _branch_map,
- std::string _list, std::string _branches)
+git_update_svn_revs(git_fi_data *s, std::string _rev_map)
{
-
if (!s->have_sha1s) {
std::cerr << "Fatal - sha1 SVN note updating requested, but don't have
original sha1 ids - redo fast-export with the --show-original-ids option.\n";
exit(1);
}
-
// read maps
std::ifstream infile_revs(svn_rev_map, std::ifstream::binary);
if (svn_rev_map.length() && !infile_revs.good()) {
@@ -195,77 +186,150 @@
infile_revs.close();
}
-std::ifstream infile_branches(svn_branch_map, std::ifstream::binary);
-if (svn_branch_map.length() && !infile_branches.good()) {
- std::cerr << "Could not open svn_branch_map file: " << svn_branch_map
<< "\n";
- exit(-1);
-}
-std::map bmap;
-if (infile_branches.good()) {
- std::string line;
- while (std::getline(infile_branches, line)) {
- // Skip empty lines
- if (!line.length()) {
+for (size_t i = 0; i < s->commits.size(); i++) {
+
+ if (!s->commits[i].id.sha1.length()) {
+ continue;
+ }
+ if (rmap.find(s->commits[i].id.sha1) == rmap.end()) {
+ continue;
+ }
+
+ long nrev = rmap[s->commits[i].id.sha1];
+ s->commits[i].svn_id = nrev;
+
+ std::cout << "Assigning new SVN rev " << nrev << " to " <<
s->commits[i].id.sha1 << "\n";
+
+ // Note: this isn't guaranteed to be unique... setting it mostly for
+ // the cases where it is.
+ s->rev_to_sha1[s->commits[i].svn_id] = s->commits[i].id.sha1;
+
+ // Update the message
+ std::stringstream ss(s->commits[i].commit_msg);
+ std::string nmsg, cline;
+ bool srev = false;
+
+ while (std::getline(ss, cline, '\n')) {
+ std::regex svnline("^svn:.*");
+ bool smatch = std::regex_match(cline, svnline);
+ std::regex cvsline("^cvs:.*");
+ bool cmatch = std::regex_match(cline, cvsline);
+ std::regex svnrevline("^svn:revision:([0-9]+).*");
+ bool srmatch = std::regex_match(cline, svnrevline);
+
+ // If it's not a CVS or SVN line, just append and continue
+ if (!smatch && !cmatch) {
+ nmsg.append(cline);
+ nmsg.append("\n");
continue;
}
- size_t spos = line.find_first_of(";");
- if (spos == std::string::npos) {
- std::cerr << "Invalid sha1;branch map line!: " << line << "\n";
- exit(-1);
+ if (srev && srmatch) {
+ // Already handled the revision update per srev - if cline is
+ // an old revision line, skip it.
+ continue;
}
+ if (srev) {
+ // Already done - just add back on whatever else is there.
+ nmsg.append(cline);
+ nmsg.append("\n");
+ continue;
+ }
- std::string id1 = line.substr(0, spos);
- std::string id2 = line.substr(spos+1, std::string::npos);
+ if (smatch) {
+ // The SVN revision line comes first in the svn: set -
+ // if we have found such a line, we're either replacing
+ // the existing one, inserting a new line before the
+ // current non-revision svn line, or skipping if the
+ // nrev value is -1.
+ std::string nrevline = std::string("svn:revision:") +
std::to_string(nrev);
+ nmsg.append(nrevline);
+ nmsg.append("\n");
+ // Any further svn:revision lines will be skipped - for
+ // now at least, one to a commit.
+ srev = true;
-
[brlcad-commits] SF.net SVN: brlcad:[78297] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78297
http://sourceforge.net/p/brlcad/code/78297
Author: starseeker
Date: 2021-02-22 03:09:25 + (Mon, 22 Feb 2021)
Log Message:
---
Whoops, need to keep the brlcad_conv12 output matching for the final stages,
since the corrective notes are keying off of those SHA1 values.
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 01:21:22 UTC (rev
78296)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-22 03:09:25 UTC (rev
78297)
@@ -103,7 +103,7 @@
std::string note((std::istreambuf_iterator(n)),
std::istreambuf_iterator());
// Replace git style branch name for master with SVN style name
- std::regex mstr_regex("svn:branch:master$");
+ std::regex mstr_regex("svn:branch:master");
std::string note_fixed = std::regex_replace(note, mstr_regex,
"svn:branch:trunk");
// Write the message to the commit's string;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78296] brlcad/trunk/misc
Revision: 78296 http://sourceforge.net/p/brlcad/code/78296 Author: starseeker Date: 2021-02-22 01:21:22 + (Mon, 22 Feb 2021) Log Message: --- rename Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Added Paths: --- brlcad/trunk/misc/repoconv/branch_corrections.txt Removed Paths: - brlcad/trunk/misc/repoconv/svn_branch_updates.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-02-21 23:01:23 UTC (rev 78295) +++ brlcad/trunk/misc/CMakeLists.txt2021-02-22 01:21:22 UTC (rev 78296) @@ -247,7 +247,7 @@ repoconv/svn_map_commit_revs.cxx repoconv/svn_msgs.cxx repoconv/svn_rev_updates.txt - repoconv/svn_branch_updates.txt + repoconv/branch_corrections.txt repoconv/svnfexport.cxx repoconv/svnfexport_git.cxx repoconv/svnfexport_svn.cxx Copied: brlcad/trunk/misc/repoconv/branch_corrections.txt (from rev 78295, brlcad/trunk/misc/repoconv/svn_branch_updates.txt) === --- brlcad/trunk/misc/repoconv/branch_corrections.txt (rev 0) +++ brlcad/trunk/misc/repoconv/branch_corrections.txt 2021-02-22 01:21:22 UTC (rev 78296) @@ -0,0 +1,222 @@ +8694a7bbb92edf8052bc2e32e7a61a923f1c7b85;trunk +b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.12.1 +b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.6.1 +e75443d252e4607c696c43e3da0caf641503d5a4;unlabeled-1.1.1 +60b5d4808dd43118375c08d6ebf8067a97b96c86;trunk +2c40428b7a1a989174df43b66fd00d9d960487bc;rel-5-1-branch +c365a032935f99d5cbcc5e0b7316253e918183f5;rel-5-1-branch +aec4367dafd37a7b0657c4b27414caa21ac4c1be;trunk +6468a861687abce96f1b988cf66cd9c3d183bbd5;trunk +0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;rel-5-1-branch +2ec20a87d6e216cc3af62da933a2917e96459ce2;rel-5-1-branch +7678e03883c0e09c063c6f7fecbaef5db50c4619;trunk +7a6b91272d804146e40be69cf1b197a02b7f9869;trunk +4d5fe4e8afa57a275c04f0a11cbf20c1378ce600;rel-5-1-branch +6dc89feeeaad3ab3ffcc6e122698ab51e666201a;trunk +4af5f01acc93a65ba8e158c1e407e6fa30f0a867;rel-5-1-branch +0e0ad86faa75124a20fd58a7c5952eef7dd2949b;trunk +86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;rel-5-1-branch +9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch +c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk +9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch +c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk +70f24c0838458564139cdd749b40ce0777ae6b74;trunk +3312597ec11da607ad8cdecb8e86ecd6cd43a21c;rel-5-1-branch +57dbefec33f8aeb13c9e99690a745660737ff02c;trunk +5db99eba906095eb11b3ea893b95301ba9d4;rel-5-1-branch +ea6d4c16bae6ecf30d4439d92c8dd72f56b3e942;rel-5-1-branch +4d401a8617869d3594b5948de12a374a5bd292fe;trunk +af33297408e4ec0b38fa37d211104ae8e3f4b850;rel-5-1-branch +e4c7c2c443b62ca5ab8dbfdd4347724d165c0837;trunk +c319e54f04de0b452a81fd7b2dcecbbfeb267821;trunk +b11b50a4a522208ece0ca8aa09f493e68184c065;rel-5-1-branch +115a366383216585cfcceb0edf36f3effca0f7d0;trunk +d9306778a6714c198a0b4385f57a1b7afbd4c3fc;rel-5-1-branch +cf3ac3a4bd09919521f655bc3e6f347881f89bef;trunk +9db0bcb131b8805c060ef2b35f30433d5f2d16ee;rel-5-1-branch +9fe24bec5d28fa14f9a2cf825a52a7f2adb0915a;trunk +561e8385b4f2bd30665991d6179e6702fb601cf1;rel-5-1-branch +81e183c4aa743cb002f77ce885b8a971d2a687bc;trunk +51a2d8caf35c0512efda85b11bf9a2c858ff0e77;rel-5-1-branch +3a6fdd142e59c7fee7dfb06fdaecc3b30f28d633;rel-5-1-branch +fa4138d198944ad67f26e77f6552361b87938b1a;trunk +a53d24a82016e59e54ad3fa0750238b077313a33;rel-5-1-branch +7b4f169aec730a81b5ce863648a8ae31819b97d1;trunk +c0d54d270fc0e426e99ccd42bdc95d97df888e7d;trunk +24d99686c39438784e16e393feeb2c0d4572820a;rel-5-1-branch +5d42e0a4c6542c0d0a23bfd14844f7cf9130b557;trunk +4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;rel-5-1-branch +28ceac2b857dccc8395a08a05f426badc2654b82;trunk +b334467bc02e858e5ad01f18565c740b8458b858;rel-5-1-branch +9a61489cbe78e69178e64760f3b881d292a975e4;trunk +13c8395e91b708bb045ad34da6bf52459e254287;rel-5-1-branch +0529b166dfa7dec9df728627ca1232a342f97b52;trunk +71b6b0a21675828fb10df69a83f96988abf0021a;rel-5-1-branch +5aeffe61fc5a22793e96d4b204da3688526a7c36;trunk +e974d0e833a02b40de938a22184c06e2ee9e0453;rel-5-1-branch +477bfa6c19ff8757b182f5c32bffbe0af1135f98;trunk +39b75b2eb605ab9cbe6364622a0bc32ba32f74dd;rel-5-1-branch +348729921527d5e7f2e66c509615d6879711d4d6;trunk +13dd9624b6aaf03a26c400c34494320b4223b91f;rel-5-1-branch +077a8d2fbf94e0f86edb2c4ea1bb0e134757d8e3;trunk +023369fd1ba2c63ef2a0fc973ad0283973033946;rel-5-1-branch +f1dc6d42b2b62013b7c83692922962d5a52c302c;rel-5-1-patches +4872d826a29325f265d21ced8efb5e2dfae3131a;rel-5-1-branch +aa525c3e31418766749334390ac8ca367ff99a5d;trunk +c17ba8ddea5915f8c2c535cf121ff313c2c4d294;rel-5-1-branch +e7b35bb9858eca26a412c02071b7a25cabee76ee;trunk +7ec21b4816510812a9a9ca0fd0c712bcfc5527f8;rel-5-1-branch +f1c200f10e9d5c0f896508b2967f644abafad234;rel-5-1-branch
[brlcad-commits] SF.net SVN: brlcad:[78295] brlcad/trunk/misc/repoconv
Revision: 78295 http://sourceforge.net/p/brlcad/code/78295 Author: starseeker Date: 2021-02-21 23:01:23 + (Sun, 21 Feb 2021) Log Message: --- Explicit branch assignments for CVS branches on multi-branch commits Modified Paths: -- brlcad/trunk/misc/repoconv/svn_branch_updates.txt brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_branch_updates.txt === --- brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 18:32:27 UTC (rev 78294) +++ brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 23:01:23 UTC (rev 78295) @@ -24,17 +24,199 @@ 3312597ec11da607ad8cdecb8e86ecd6cd43a21c;rel-5-1-branch 57dbefec33f8aeb13c9e99690a745660737ff02c;trunk 5db99eba906095eb11b3ea893b95301ba9d4;rel-5-1-branch +ea6d4c16bae6ecf30d4439d92c8dd72f56b3e942;rel-5-1-branch +4d401a8617869d3594b5948de12a374a5bd292fe;trunk +af33297408e4ec0b38fa37d211104ae8e3f4b850;rel-5-1-branch +e4c7c2c443b62ca5ab8dbfdd4347724d165c0837;trunk +c319e54f04de0b452a81fd7b2dcecbbfeb267821;trunk +b11b50a4a522208ece0ca8aa09f493e68184c065;rel-5-1-branch +115a366383216585cfcceb0edf36f3effca0f7d0;trunk +d9306778a6714c198a0b4385f57a1b7afbd4c3fc;rel-5-1-branch +cf3ac3a4bd09919521f655bc3e6f347881f89bef;trunk +9db0bcb131b8805c060ef2b35f30433d5f2d16ee;rel-5-1-branch +9fe24bec5d28fa14f9a2cf825a52a7f2adb0915a;trunk +561e8385b4f2bd30665991d6179e6702fb601cf1;rel-5-1-branch +81e183c4aa743cb002f77ce885b8a971d2a687bc;trunk +51a2d8caf35c0512efda85b11bf9a2c858ff0e77;rel-5-1-branch +3a6fdd142e59c7fee7dfb06fdaecc3b30f28d633;rel-5-1-branch +fa4138d198944ad67f26e77f6552361b87938b1a;trunk +a53d24a82016e59e54ad3fa0750238b077313a33;rel-5-1-branch +7b4f169aec730a81b5ce863648a8ae31819b97d1;trunk +c0d54d270fc0e426e99ccd42bdc95d97df888e7d;trunk +24d99686c39438784e16e393feeb2c0d4572820a;rel-5-1-branch +5d42e0a4c6542c0d0a23bfd14844f7cf9130b557;trunk +4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;rel-5-1-branch +28ceac2b857dccc8395a08a05f426badc2654b82;trunk +b334467bc02e858e5ad01f18565c740b8458b858;rel-5-1-branch +9a61489cbe78e69178e64760f3b881d292a975e4;trunk +13c8395e91b708bb045ad34da6bf52459e254287;rel-5-1-branch +0529b166dfa7dec9df728627ca1232a342f97b52;trunk +71b6b0a21675828fb10df69a83f96988abf0021a;rel-5-1-branch +5aeffe61fc5a22793e96d4b204da3688526a7c36;trunk +e974d0e833a02b40de938a22184c06e2ee9e0453;rel-5-1-branch +477bfa6c19ff8757b182f5c32bffbe0af1135f98;trunk +39b75b2eb605ab9cbe6364622a0bc32ba32f74dd;rel-5-1-branch +348729921527d5e7f2e66c509615d6879711d4d6;trunk +13dd9624b6aaf03a26c400c34494320b4223b91f;rel-5-1-branch +077a8d2fbf94e0f86edb2c4ea1bb0e134757d8e3;trunk +023369fd1ba2c63ef2a0fc973ad0283973033946;rel-5-1-branch +f1dc6d42b2b62013b7c83692922962d5a52c302c;rel-5-1-patches +4872d826a29325f265d21ced8efb5e2dfae3131a;rel-5-1-branch +aa525c3e31418766749334390ac8ca367ff99a5d;trunk +c17ba8ddea5915f8c2c535cf121ff313c2c4d294;rel-5-1-branch +e7b35bb9858eca26a412c02071b7a25cabee76ee;trunk +7ec21b4816510812a9a9ca0fd0c712bcfc5527f8;rel-5-1-branch +f1c200f10e9d5c0f896508b2967f644abafad234;rel-5-1-branch +e9452d6fd0dadb1192d99777acf891b0bc7703bb;trunk +45a67834524348e32e2c1d34071b59dbb1360d9e;rel-5-1-branch +fb7437f02dde3953bb257548c453724ad1af30db;trunk +381e3b2e2bc8807615ae11a06ec8e4eb89509f6c;trunk +2b82299887068d18e9eeab288a825dce0603b29c;rel-5-1-branch +e81140fba764449e55241b4d5b79a0a9be103015;trunk +03ef287c9f854dcb2c5bad5bdecea2625e7f8bc3;rel-5-1-branch +f03e7005f7c458ee96694b12e457ac03b183c6ff;trunk +b963ebd8d5c178f27c322c70b9dfd692f9a71640;rel-5-1-branch +c4a48334f3efdd8ae641d1d943f253c8659cda69;trunk +1575b390eaee5f8a22aa24e45879beec0b92f223;rel-5-1-branch +92965698f84c2ba5fd8ed9a3a5bd1b59076088b1;trunk +b685aafbfa677f91822bf9fff3566efe28533c84;rel-5-1-branch +6f4104bd83cf4a930bda9cbaa1b811d3e0d236b3;rel-5-1-branch +a378bc31e13250a8a4537f578c41870716614fdf;trunk +c378362029d03ad65008dfc357d5099a46529acc;trunk +81d43f9bd341f538596d0d3622004965864fae12;rel-5-1-branch +2731eb2fbda07495209d271b36629e48dc9e7836;rel-5-1-branch +48288e65b6a227b30f00dea46073840363b9fc2d;trunk +72ed33f0fcb6b9eb1df38a45e50b05dd9be127ce;trunk +7659837e02a36ce3171dd87f8bced3a0a252bbe1;rel-5-1-branch +6af6602bcdb5227c51a6b467226d5fc70d321855;rel-5-1-branch +ead896de7fe9c9f235b720ed5f3bcf6d7877989b;trunk +3b09c81489d83bafbd5bde89f362a897aed76c80;trunk +0e3431831481521fe66ad6b4041a6a9129af2a09;rel-5-1-branch +4b51763bd75123f81f069bba1b873c4538776530;rel-5-1-branch +e2311ccf85cd092b2bac862d142e5ab028b571ed;trunk +d82708b47d89c008a20ce23ba23ce4aca80cf232;rel-5-1-branch +86dd96c71327854f7dcd3a4c352446503134120d;trunk +f393d20a3ff6461e3996fb932bb229d7c66f5064;trunk +58f8238edcf9b3846857af71727d0d1bc7e4bec4;rel-5-1-branch +edaf04c3439e8efd37658dc8fe7ea5afd510d211;trunk +67cde13525c50e995c07c1dfcf0ba1eb447e67b3;rel-5-1-branch +02a67919ee91a819858ea099d5847f712020075a;trunk +5ce7326cdfa96d00541253cf082735a2bc396b77;rel-5-1-branch
[brlcad-commits] SF.net SVN: brlcad:[78294] brlcad/trunk/misc/repoconv/ svn_branch_updates.txt
Revision: 78294 http://sourceforge.net/p/brlcad/code/78294 Author: starseeker Date: 2021-02-21 18:32:27 + (Sun, 21 Feb 2021) Log Message: --- Start manually sorting through CVS branch assignments for Git commits. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_branch_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_branch_updates.txt === --- brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 17:59:29 UTC (rev 78293) +++ brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 18:32:27 UTC (rev 78294) @@ -1,8 +1,37 @@ -68aeb784b3ee698c854878c190eb4b229b88e1fe;unlabeled-2.5.1 -e4c97aa291ec4b5bf6d9bd3abca27da12fb108f9;unlabeled-2.5.1 +8694a7bbb92edf8052bc2e32e7a61a923f1c7b85;trunk +b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.12.1 b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.6.1 e75443d252e4607c696c43e3da0caf641503d5a4;unlabeled-1.1.1 +60b5d4808dd43118375c08d6ebf8067a97b96c86;trunk 2c40428b7a1a989174df43b66fd00d9d960487bc;rel-5-1-branch +c365a032935f99d5cbcc5e0b7316253e918183f5;rel-5-1-branch +aec4367dafd37a7b0657c4b27414caa21ac4c1be;trunk +6468a861687abce96f1b988cf66cd9c3d183bbd5;trunk +0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;rel-5-1-branch +2ec20a87d6e216cc3af62da933a2917e96459ce2;rel-5-1-branch +7678e03883c0e09c063c6f7fecbaef5db50c4619;trunk +7a6b91272d804146e40be69cf1b197a02b7f9869;trunk +4d5fe4e8afa57a275c04f0a11cbf20c1378ce600;rel-5-1-branch +6dc89feeeaad3ab3ffcc6e122698ab51e666201a;trunk +4af5f01acc93a65ba8e158c1e407e6fa30f0a867;rel-5-1-branch +0e0ad86faa75124a20fd58a7c5952eef7dd2949b;trunk +86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;rel-5-1-branch +9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch +c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk +9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829;rel-5-1-branch +c3d19e5470e3861fc4db59c76f6de465f65fccbd;trunk +70f24c0838458564139cdd749b40ce0777ae6b74;trunk +3312597ec11da607ad8cdecb8e86ecd6cd43a21c;rel-5-1-branch +57dbefec33f8aeb13c9e99690a745660737ff02c;trunk +5db99eba906095eb11b3ea893b95301ba9d4;rel-5-1-branch + + + + + +e4c97aa291ec4b5bf6d9bd3abca27da12fb108f9;unlabeled-2.5.1 + +2c40428b7a1a989174df43b66fd00d9d960487bc;rel-5-1-branch ca509f25f562e6b1d61f591f29c56a134918d9a0;windows-branch 4de8eed563b64b2aed0fc99cd26174e56aacd275;windows-6-0-branch 6c52280f0ce66cb202830a655fa769756b51922b;windows-branch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78293] brlcad/trunk/misc/repoconv
Revision: 78293 http://sourceforge.net/p/brlcad/code/78293 Author: starseeker Date: 2021-02-21 17:59:29 + (Sun, 21 Feb 2021) Log Message: --- More SVN id assignments, and a few branch assignments. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_branch_updates.txt brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_branch_updates.txt === --- brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 16:19:27 UTC (rev 78292) +++ brlcad/trunk/misc/repoconv/svn_branch_updates.txt 2021-02-21 17:59:29 UTC (rev 78293) @@ -1,3 +1,11 @@ 68aeb784b3ee698c854878c190eb4b229b88e1fe;unlabeled-2.5.1 e4c97aa291ec4b5bf6d9bd3abca27da12fb108f9;unlabeled-2.5.1 +b7601aa25e8b40f6a0537c96483a29c52c807fa9;unlabeled-2.6.1 +e75443d252e4607c696c43e3da0caf641503d5a4;unlabeled-1.1.1 +2c40428b7a1a989174df43b66fd00d9d960487bc;rel-5-1-branch +ca509f25f562e6b1d61f591f29c56a134918d9a0;windows-branch +4de8eed563b64b2aed0fc99cd26174e56aacd275;windows-6-0-branch +6c52280f0ce66cb202830a655fa769756b51922b;windows-branch +8619478e69f04adf07e28a3cb4a6ed6c59559e37;windows-6-0-branch +6b6eb437ad12a669f7f98cc1b0ce1c2c66eb9d88;windows-branch Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-21 16:19:27 UTC (rev 78292) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-21 17:59:29 UTC (rev 78293) @@ -1,5 +1,42 @@ 771b3183f9e315f6e1451a1e3462e6f84724a9cd;735 +eb4b12d2baecffdc33a56ba89b29d611395b8f3d;19755 +2788b39fe6de7e5fbfcdc30b9c38e2a15b69bf63;21635 +050bedc3065ed5b051958343bae465c2823ad29e;21635 +0d7ec74a6b6056eafeac1cec2d8f749ac5a2a58f;22217 +f2198bbd3d4008a1c96c8ef754843a3fb3ebc52c;22217 +8e5003746ec73083cb3b297f9b2f75f2e4a5d185;22235 +eb90c0d3de7dab529ae6bd9cc86a8e9e9d605a6f;22235 +d6e81dcd234f945eaa3711017b4375207b57a657;22237 +84aaa63c9d68b0ff2c43b869763892eb5320de57;22238 +423995351c4ae081e1027f73e61adce3762eb47a;22239 +7611c75e2d3c54c03d35970f687f5f36fceff73d;22247 +8810b59008c23ab7e1ac820d4686afa389a29865;22247 +6c3f1d5fe1f4c472dfbcca02203b0d405fffdeee;22253 +d7ab3fc00a10b297b0ad523db1feed88c16625cc;22253 +8350a6a2a319d98911d7d716bb8f649df1a1c09b;22298 +dc581573bb9668a74374d795b2b2aae645f7f455;22298 +e0f1431476622b7f3f359728767a32a6d3736514;22387 +c97825005e7235945182193557cce770bea3eb18;22387 +e5e18d9001190ff7d177bbfcbce47e9f87d34614;22387 +562202b629a5ecb71df28009c12671a6c8c618c6;22388 +a2ea3f23ecc8a5208b8e17594bda741a2efc0d90;22388 +8ab1d383e4ddff5586695436f590e098f179a907;22388 +ecac9050185c26596ed56a6362d2ae4fcc73ae66;22389 +ef0b98c70244d510a74f12d6932d3dadf91c825a;22390 +bea86bb0b7f27a437ec216f472c38351013ce14e;22390 +92c9dd90980d9c423308bbfc5e2b580fb7297299;22391 +4308bde0140e26193670988760c71749d77fa54e;22391 +aeb1621d3ce4e2a897af76f857aa3d6858468493;22391 +d76af6397231abfaa9aa6f4ebd775b5e42a101e0;22391 +df0ed9481aa1fc9b7a41e3ab8edb56bac6e4257f;22391 +f6ad1589e4ee86ea237796c56d1a20eaabcc174f;22391 +8619478e69f04adf07e28a3cb4a6ed6c59559e37;22468 +6c52280f0ce66cb202830a655fa769756b51922b;22468 +4de8eed563b64b2aed0fc99cd26174e56aacd275;22468 +ca509f25f562e6b1d61f591f29c56a134918d9a0;22468 + + aec4367dafd37a7b0657c4b27414caa21ac4c1be;19033 7678e03883c0e09c063c6f7fecbaef5db50c4619;19211 7a6b91272d804146e40be69cf1b197a02b7f9869;19282 @@ -19,6 +56,9 @@ 86dd96c71327854f7dcd3a4c352446503134120d;19798 6699b9f0df300c7c7280381e0fbbcf525f9f31e0;19839 +b7601aa25e8b40f6a0537c96483a29c52c807fa9;849 +e75443d252e4607c696c43e3da0caf641503d5a4;5208 +2c40428b7a1a989174df43b66fd00d9d960487bc;18999 0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;19184 86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;19286 5db99eba906095eb11b3ea893b95301ba9d4;19386 @@ -83,10 +123,10 @@ e98e4d29b9c2e6bb14787a23769066b2b42829b4;22497 eb80ac41568315c9e7bc58fe579e3dbc0cae468c;22541 970e9289ca8171fdc99464e916653b0475308c31;22548 +a1f86ee4d99f65e59a52d660aca2910f7ce5d9af;22550 - a7c85f280677d70b8eef9aadf79302736ed26ffc; f5a1b0037fec2927cba073d118db24cdbd681975; a098425430db227021617976961e6b51ce5569cb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78292] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78292 http://sourceforge.net/p/brlcad/code/78292 Author: starseeker Date: 2021-02-21 16:19:27 + (Sun, 21 Feb 2021) Log Message: --- Groan. To really do this properly for multi branch commits I need to adjust how these messages are being updated. Modified Paths: -- brlcad/trunk/misc/repowork/repowork.cpp Modified: brlcad/trunk/misc/repowork/repowork.cpp === --- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-20 02:29:43 UTC (rev 78291) +++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-21 16:19:27 UTC (rev 78292) @@ -146,6 +146,12 @@ return 0; } +// TODO: need to change how we're doing this. Need multiple passes: +// +// 1. Assign SVN commit numbers +// 2. SVN branch->tag label updates +// 3. General SVN revs->branches update +// 4. Specific CVS era SVN branch assignment corrections (for when we can peg specific Git commits to specific SVN branches.) int git_update_svnnotes(git_fi_data *s, std::string _rev_map, std::string _branch_map, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78291] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78291
http://sourceforge.net/p/brlcad/code/78291
Author: starseeker
Date: 2021-02-20 02:29:43 + (Sat, 20 Feb 2021)
Log Message:
---
Don't trust any git output for the CVS era - only assign a branch if we have
SVN info.
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-20 02:13:18 UTC (rev
78290)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-20 02:29:43 UTC (rev
78291)
@@ -445,14 +445,11 @@
}
}
- if (revnum == 19673) {
- std::cout << "revnum: " << revnum << "\n";
- }
- if (cmatch && revnum > 0 && rev_bset[revnum].size()) {
- std::regex cvsbranchline("^cvs:branch:.*");
+ if (cmatch) {
+ std::regex cvsbranchline("^cvs:branch:.*");
bool sbmatch = std::regex_match(cline, cvsbranchline);
if (sbmatch) {
- if (!wcvsbranch) {
+ if (revnum > 0 && rev_bset[revnum].size() && !wcvsbranch) {
std::set::iterator s_it;
for (s_it = rev_bset[revnum].begin(); s_it !=
rev_bset[revnum].end(); s_it++) {
std::string nbranchline =
std::string("cvs:branch:") + *s_it;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78290] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78290
http://sourceforge.net/p/brlcad/code/78290
Author: starseeker
Date: 2021-02-20 02:13:18 + (Sat, 20 Feb 2021)
Log Message:
---
Rough in an ability to update the cvs:branch tags based on SVN's info.
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-20 00:28:24 UTC (rev
78289)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-20 02:13:18 UTC (rev
78290)
@@ -12,10 +12,27 @@
*/
#include
+#include
+#include
+#include
#include "cxxopts.hpp"
#include "repowork.h"
+
+// https://stackoverflow.com/a/5607650
+struct schars: std::ctype {
+schars(): std::ctype(get_table()) {}
+static std::ctype_base::mask const* get_table() {
+static const std::ctype::mask *const_table=
std::ctype::classic_table();
+static std::ctype::mask cmask[std::ctype::table_size];
+std::memcpy(cmask, const_table, std::ctype::table_size *
sizeof(std::ctype::mask));
+cmask[';'] = std::ctype_base::space;
+return [0];
+}
+};
+
+
int
git_parse_commitish(git_commitish , git_fi_data *s, std::string line)
{
@@ -130,7 +147,9 @@
}
int
-git_update_svnnotes(git_fi_data *s, std::string _rev_map, std::string
_branch_map, std::string _list)
+git_update_svnnotes(git_fi_data *s,
+ std::string _rev_map, std::string _branch_map,
+ std::string _list, std::string _branches)
{
if (!s->have_sha1s) {
@@ -144,17 +163,6 @@
std::cerr << "Could not open svn_rev_map file: " << svn_rev_map << "\n";
exit(-1);
}
-std::ifstream infile_branches(svn_branch_map, std::ifstream::binary);
-if (svn_branch_map.length() && !infile_branches.good()) {
- std::cerr << "Could not open svn_branch_map file: " << svn_branch_map
<< "\n";
- exit(-1);
-}
-std::ifstream infile_tag_list(tag_list, std::ifstream::binary);
-if (tag_list.length() && !infile_tag_list.good()) {
- std::cerr << "Could not open tag_list file: " << tag_list << "\n";
- exit(-1);
-}
-
std::map rmap;
if (infile_revs.good()) {
std::string line;
@@ -181,7 +189,11 @@
infile_revs.close();
}
-
+std::ifstream infile_branches(svn_branch_map, std::ifstream::binary);
+if (svn_branch_map.length() && !infile_branches.good()) {
+ std::cerr << "Could not open svn_branch_map file: " << svn_branch_map
<< "\n";
+ exit(-1);
+}
std::map bmap;
if (infile_branches.good()) {
std::string line;
@@ -207,6 +219,11 @@
infile_branches.close();
}
+std::ifstream infile_tag_list(tag_list, std::ifstream::binary);
+if (tag_list.length() && !infile_tag_list.good()) {
+ std::cerr << "Could not open tag_list file: " << tag_list << "\n";
+ exit(-1);
+}
std::set tag_sha1s;
if (infile_tag_list.good()) {
std::string line;
@@ -232,8 +249,52 @@
infile_tag_list.close();
}
+std::ifstream infile_revs_branches(revs_branches, std::ifstream::binary);
+if (revs_branches.length() && !infile_revs_branches.good()) {
+ std::cerr << "Could not open revs_branches file: " << revs_branches <<
"\n";
+ exit(-1);
+}
+std::map> rev_bset;
+if (infile_revs_branches.good()) {
+ std::string line;
+ while (std::getline(infile_revs_branches, line)) {
+ size_t spos = line.find_first_of(":");
+ if (spos == std::string::npos) {
+ std::cerr << "Invalid sha1;branch map line!: " << line << "\n";
+ exit(-1);
+ }
+
+ std::string rev_str = line.substr(0, spos);
+ int rev = (rev_str.length()) ? std::stoi(rev_str) : -1;
+ if (rev < 0) continue;
+ std::string branches = line.substr(spos+1, std::string::npos);
+
+ // If no branches, nothing to do
+ if (!branches.length()) {
+ continue;
+ }
+
+ // Split into a vector, since there may be more than one branch
+ std::stringstream ss(branches);
+ std::ostringstream oss;
+ ss.imbue(std::locale(std::locale(), new schars()));
+ std::istream_iterator b_begin(ss);
+ std::istream_iterator b_end;
+ std::vector branches_array(b_begin, b_end);
+ std::copy(branches_array.begin(), branches_array.end(),
std::ostream_iterator(oss, "\n"));
+ for (size_t i = 0; i < branches_array.size(); i++) {
+ rev_bset[rev].insert(branches_array[i]);
+ }
+ }
+
+ std::cout << "Found " << rev_bset.size() << " revision->branch
mappings\n";
+
+ infile_revs_branches.close();
+}
+
+
// Iterate over the commits looking for note commits. If we find one,
// find its associated blob with data,
[brlcad-commits] SF.net SVN: brlcad:[78289] brlcad/trunk/misc
Revision: 78289 http://sourceforge.net/p/brlcad/code/78289 Author: starseeker Date: 2021-02-20 00:28:24 + (Sat, 20 Feb 2021) Log Message: --- Grr. The CVS branch assignments based off of git rev-list --first-parent proved unreliable - Sean noted that we can check the CVS .v files to get explicit branch information, and it looks likethe SVN assignments were correct. I may be wrong, but it's looking like Git just conceptually does not retain this origin information at all. Stash the set of revs->branches, so we can fix the commit messages with repowork. Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Added Paths: --- brlcad/trunk/misc/repoconv/cvs_svn_branches.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-02-19 22:46:27 UTC (rev 78288) +++ brlcad/trunk/misc/CMakeLists.txt2021-02-20 00:28:24 UTC (rev 78289) @@ -208,6 +208,7 @@ repoconv/domap.sh repoconv/email_fixups.txt repoconv/cvs_repaired/sphflake.pix,v + repoconv/cvs_svn_branches.txt repoconv/gitattributes repoconv/github_ci_actions.yml repoconv/gitignore.tar.gz Added: brlcad/trunk/misc/repoconv/cvs_svn_branches.txt === --- brlcad/trunk/misc/repoconv/cvs_svn_branches.txt (rev 0) +++ brlcad/trunk/misc/repoconv/cvs_svn_branches.txt 2021-02-20 00:28:24 UTC (rev 78289) @@ -0,0 +1,29783 @@ +2:trunk +3:trunk +4:unlabeled-1.2.1 +5:trunk +6:trunk +7:trunk +8:trunk +9:unlabeled-1.2.1 +10:trunk +11:trunk +13:trunk +14:trunk +15:trunk +16:trunk +17:trunk +18:trunk +19:trunk +20:trunk +21:trunk +22:trunk +23:trunk +24:trunk +25:trunk +26:trunk +27:trunk +28:trunk +29:trunk +30:trunk +31:trunk +32:trunk +33:trunk +34:trunk +35:trunk +36:trunk +37:trunk +38:trunk +39:trunk +40:trunk +41:trunk +42:trunk +43:trunk +44:trunk +45:trunk +46:trunk +47:trunk +48:trunk +49:trunk +50:trunk +51:trunk +52:trunk +53:trunk +54:trunk +55:trunk +56:trunk +57:trunk +58:trunk +59:trunk +60:trunk +61:trunk +62:trunk +63:trunk +64:trunk +65:trunk +66:trunk +67:trunk +68:trunk +69:trunk +70:trunk +71:trunk +72:trunk +73:trunk +74:trunk +75:trunk +76:trunk +77:trunk +78:trunk +79:trunk +80:trunk +81:trunk +82:trunk +83:trunk +84:trunk +85:trunk +86:trunk +87:trunk +88:trunk +89:trunk +90:trunk +91:trunk +92:trunk +93:trunk +94:trunk +95:trunk +96:trunk +97:trunk +98:trunk +99:trunk +100:trunk +101:trunk +102:trunk +103:trunk +104:trunk +105:trunk +106:trunk +107:trunk +108:trunk +109:trunk +110:trunk +111:trunk +112:trunk +113:trunk +114:trunk +115:trunk +116:trunk +117:trunk +118:trunk +119:trunk +120:trunk +121:trunk +122:trunk +123:trunk +124:trunk +125:trunk +126:trunk +127:trunk +128:trunk +129:trunk +130:trunk +131:trunk +132:trunk +133:trunk +134:trunk +135:trunk +136:trunk +137:trunk +138:trunk +139:trunk +140:trunk +141:trunk +142:trunk +143:trunk +144:trunk +145:trunk +146:trunk +147:trunk +148:trunk +149:trunk +150:trunk +151:trunk +152:trunk +153:trunk +154:trunk +155:trunk +156:trunk +157:trunk +158:trunk +159:trunk +160:trunk +161:trunk +162:trunk +163:trunk +164:trunk +165:trunk +166:trunk +167:trunk +168:trunk +169:trunk +170:trunk +171:trunk +172:trunk +173:trunk +174:trunk +175:trunk +176:trunk +177:trunk +178:trunk +179:trunk +180:trunk +181:trunk +182:trunk +183:trunk +184:trunk +185:trunk +186:trunk +187:trunk +188:trunk +189:trunk +190:trunk +191:trunk +192:trunk +193:trunk +194:trunk +195:trunk +196:trunk +197:trunk +198:trunk +199:trunk +200:trunk +201:trunk +202:trunk +203:trunk +204:trunk +205:trunk +206:trunk +207:trunk +208:trunk +209:trunk +210:trunk +211:trunk +212:trunk +213:trunk +214:trunk +215:trunk +216:trunk +217:trunk +218:trunk +219:trunk +220:trunk +221:trunk +222:trunk +223:trunk +224:trunk +225:trunk +226:trunk +227:trunk +228:trunk +229:trunk +230:trunk +231:trunk +232:trunk +233:trunk +234:trunk +235:trunk +236:trunk +237:trunk +238:trunk +239:trunk +240:trunk +241:trunk +242:trunk +243:trunk +244:trunk +245:trunk +246:trunk +247:trunk +248:trunk +249:trunk +250:trunk +251:trunk +252:trunk +253:trunk +254:trunk +255:trunk +256:trunk +257:trunk +258:trunk +259:trunk +260:trunk +261:trunk +262:trunk +263:trunk +264:trunk +265:trunk +266:trunk +267:trunk +268:trunk +269:trunk +270:trunk +271:trunk +272:trunk +273:trunk +274:trunk +275:trunk +276:trunk +277:trunk +278:trunk +279:trunk +280:trunk +281:trunk +282:trunk +283:trunk +284:trunk +285:trunk +286:trunk +287:trunk +288:trunk +289:trunk +290:trunk +291:trunk +292:trunk +293:trunk +294:trunk +295:trunk +296:trunk +297:trunk +298:trunk +299:trunk +300:trunk +301:trunk +302:trunk +303:trunk +304:trunk +305:trunk +306:trunk +307:trunk +308:trunk +309:trunk +310:trunk +311:trunk +312:trunk +313:trunk +314:trunk +315:trunk +316:trunk +317:trunk +318:trunk +319:trunk +320:trunk +321:trunk +322:trunk
[brlcad-commits] SF.net SVN: brlcad:[78287] brlcad/trunk/misc/repoconv/NOTES
Revision: 78287 http://sourceforge.net/p/brlcad/code/78287 Author: starseeker Date: 2021-02-19 21:49:47 + (Fri, 19 Feb 2021) Log Message: --- Note link describing how to track all remote branches. Modified Paths: -- brlcad/trunk/misc/repoconv/NOTES Modified: brlcad/trunk/misc/repoconv/NOTES === --- brlcad/trunk/misc/repoconv/NOTES2021-02-19 21:31:26 UTC (rev 78286) +++ brlcad/trunk/misc/repoconv/NOTES2021-02-19 21:49:47 UTC (rev 78287) @@ -54,7 +54,12 @@ Possibly useful notes for OSX/Windows users: https://stackoverflow.com/questions/8904327/case-sensitivity-in-git + +Once we're on github, this is handy given the number of branches we have in the main repo: +https://stackoverflow.com/questions/379081/track-all-remote-git-branches-as-local-branches + + # .gitconfig helpers ### Here is a simple way to use notes with svn revision numbers to checkout a specific revision: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78286] brlcad/trunk/src/isst
Revision: 78286
http://sourceforge.net/p/brlcad/code/78286
Author: starseeker
Date: 2021-02-19 21:31:26 + (Fri, 19 Feb 2021)
Log Message:
---
Set up mouse move event handler for OpenGL widget. Not doing anything with the
info yet, jus making sure we can capture it.
Modified Paths:
--
brlcad/trunk/src/isst/isstgl.cpp
brlcad/trunk/src/isst/isstgl.h
Modified: brlcad/trunk/src/isst/isstgl.cpp
===
--- brlcad/trunk/src/isst/isstgl.cpp2021-02-19 21:23:19 UTC (rev 78285)
+++ brlcad/trunk/src/isst/isstgl.cpp2021-02-19 21:31:26 UTC (rev 78286)
@@ -174,6 +174,19 @@
}
+void isstGL::mouseMoveEvent(QMouseEvent *e) {
+
+bu_log("(%d,%d)\n", e->x(), e->y());
+if (x_prev > -INT_MAX && y_prev > -INT_MAX) {
+ bu_log("Delta: (%d,%d)\n", e->x() - x_prev, e->y() - y_prev);
+}
+
+x_prev = e->x();
+y_prev = e->y();
+
+QOpenGLWidget::mouseMoveEvent(e);
+}
+
void isstGL::save_image() {
QImage image = this->grabFramebuffer();
image.save("file.png");
Modified: brlcad/trunk/src/isst/isstgl.h
===
--- brlcad/trunk/src/isst/isstgl.h 2021-02-19 21:23:19 UTC (rev 78285)
+++ brlcad/trunk/src/isst/isstgl.h 2021-02-19 21:31:26 UTC (rev 78286)
@@ -62,6 +62,7 @@
void paintGL() override;
void keyPressEvent(QKeyEvent *k) override;
+ void mouseMoveEvent(QMouseEvent *e) override;
private:
struct camera_tile_s tile;
@@ -72,6 +73,9 @@
int resolution_factor = 0;
int rescaled = 0;
int do_render = 1;
+
+ int x_prev = -INT_MAX;
+ int y_prev = -INT_MAX;
};
#endif /* ISSTGL_H */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78285] brlcad/trunk/misc/CMakeLists.txt
Revision: 78285 http://sourceforge.net/p/brlcad/code/78285 Author: starseeker Date: 2021-02-19 21:23:19 + (Fri, 19 Feb 2021) Log Message: --- Fix filename Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-02-19 19:27:27 UTC (rev 78284) +++ brlcad/trunk/misc/CMakeLists.txt2021-02-19 21:23:19 UTC (rev 78285) @@ -252,7 +252,7 @@ repoconv/svnfexport_svn.cxx repoconv/sync_commit.sh repoconv/sync_commit_trunk.sh - repoconv/tagcommits.txt + repoconv/tag_commits.txt repoconv/tagmap.sh repoconv/terra.dsp repoconv/verify/cvs.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78284] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78284 http://sourceforge.net/p/brlcad/code/78284 Author: starseeker Date: 2021-02-19 19:27:27 + (Fri, 19 Feb 2021) Log Message: --- More SVN assignments for multi-branch commits. Some of these are approximate, as the commits were broken out differently by cvs2svn and cvs-fast-export. A few of the later cases in the 222** - 223** range are different enough that it's probably not worth sorting through. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-19 18:41:48 UTC (rev 78283) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-19 19:27:27 UTC (rev 78284) @@ -25,6 +25,7 @@ b11b50a4a522208ece0ca8aa09f493e68184c065;19450 d9306778a6714c198a0b4385f57a1b7afbd4c3fc;19463 9db0bcb131b8805c060ef2b35f30433d5f2d16ee;19471 +561e8385b4f2bd30665991d6179e6702fb601cf1;19548 51a2d8caf35c0512efda85b11bf9a2c858ff0e77;19552 24d99686c39438784e16e393feeb2c0d4572820a;19601 4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;19613 @@ -50,8 +51,42 @@ 67cde13525c50e995c07c1dfcf0ba1eb447e67b3;19815 5ce7326cdfa96d00541253cf082735a2bc396b77;19835 6949221976767b94b98694b73d2b35a12c66933f;19838 +d8f84df3a2b0de48401d529eb3c5085ea3a63bc8;19851 +2552fce0d09dd84d4b3c96542acb0f9c3316be33;19861 +6bf673cb4d9a1494556650cd943e1bddca7dfa99;19876 +896fa995db4a67110daa901d1cf33f32d066cd37;19890 +0f2c208901f1be40e179ab5f82e354d91d857c30;19891 +564dc02af097baef086abe1046bd29e269bbf873;19893 +f2483efbe86075184c3e532e9928541e880e0bc1;19910 +12ea2759e9743c0020493128a7eb9f343abf656e;19925 +eb925b5801eba11d4b67afaf7f1bd8ab9a07df53;19926 +50d6fbda97b40024a2ac763ae6c3bdf62d93f253;19927 +63f0fdecc0fe75623fa5efe468f7541330437bcd;19932 +e177f07fa374f84d049a7763614186cc09187b6a;19956 +820ca4d216618ba4057ce0061aab3a2572a5a296;19969 +09cc3dd0f4dbf6c626dd858c038c2e2ad2876cc3;19982 +2fa6bddfaf2190ee0b454973e38673459288041f;19985 +2ad9dd4a7471cfcc3ff930c4127ac61ff5b48ec0;19995 +92d120ecc173c85dee010614ad6ad9907f587686;20167 +f683ed21aeafdadf06fda89827835c80afcea0e9;20168 +4745265d80c06da63c482fc5207cec3c8153efe8;22003 +40c52130fee96105b533aa8b53d00e39563a3fbe;22213 +660bd1343a7af4f6ab020613c77fd7462a644940;22267 +7f9f41a46b1ed8736f5239274606fcf767e02b33;22269 +a3c55e5c1020f5c0de2d349b4d92e5265c3ff069;22278 +0abafd686799fc26b254bc51333892d32b164232;22291 +76ec6df24e65b8d62be5ace5268a1a3a50bbd498;22393 +a145bfa1bb9c6e983fd2811cb2d5a483a79e13bf;22398 +e4e9d370655727c5db6653a29fcf3a76037f408c;22404 +728416b9c07206b881a59eb93512cb08e02786f3;22408 +036806029bf6802f9828fb9997c12a4b4f02ab3c;22491 +e98e4d29b9c2e6bb14787a23769066b2b42829b4;22497 +eb80ac41568315c9e7bc58fe579e3dbc0cae468c;22541 +970e9289ca8171fdc99464e916653b0475308c31;22548 + + a7c85f280677d70b8eef9aadf79302736ed26ffc; f5a1b0037fec2927cba073d118db24cdbd681975; a098425430db227021617976961e6b51ce5569cb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78283] brlcad/trunk/misc/repoconv/svn_rev_updates.txt
Revision: 78283 http://sourceforge.net/p/brlcad/code/78283 Author: starseeker Date: 2021-02-19 18:41:48 + (Fri, 19 Feb 2021) Log Message: --- Checkpoint update SVN id assignments being found based on Sean's identification of multi-branch commits. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-19 17:04:04 UTC (rev 78282) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-19 18:41:48 UTC (rev 78283) @@ -1,42 +1,57 @@ 771b3183f9e315f6e1451a1e3462e6f84724a9cd;735 -c365a032935f99d5cbcc5e0b7316253e918183f5; aec4367dafd37a7b0657c4b27414caa21ac4c1be;19033 -2ec20a87d6e216cc3af62da933a2917e96459ce2; 7678e03883c0e09c063c6f7fecbaef5db50c4619;19211 -4d5fe4e8afa57a275c04f0a11cbf20c1378ce600; 7a6b91272d804146e40be69cf1b197a02b7f9869;19282 -4af5f01acc93a65ba8e158c1e407e6fa30f0a867; 6dc89feeeaad3ab3ffcc6e122698ab51e666201a;19283 -9f4472b6c4a9d77005a25bac0e6ea9d0b45c6829; c3d19e5470e3861fc4db59c76f6de465f65fccbd;19288 -3312597ec11da607ad8cdecb8e86ecd6cd43a21c; 70f24c0838458564139cdd749b40ce0777ae6b74;19289 -ea6d4c16bae6ecf30d4439d92c8dd72f56b3e942; 4d401a8617869d3594b5948de12a374a5bd292fe;19440 -af33297408e4ec0b38fa37d211104ae8e3f4b850; e4c7c2c443b62ca5ab8dbfdd4347724d165c0837;19449 -3a6fdd142e59c7fee7dfb06fdaecc3b30f28d633; fa4138d198944ad67f26e77f6552361b87938b1a;19558 -a53d24a82016e59e54ad3fa0750238b077313a33; 7b4f169aec730a81b5ce863648a8ae31819b97d1;19587 -f1c200f10e9d5c0f896508b2967f644abafad234; e9452d6fd0dadb1192d99777acf891b0bc7703bb;19720 -45a67834524348e32e2c1d34071b59dbb1360d9e; fb7437f02dde3953bb257548c453724ad1af30db;19723 -6f4104bd83cf4a930bda9cbaa1b811d3e0d236b3; a378bc31e13250a8a4537f578c41870716614fdf;19772 -2731eb2fbda07495209d271b36629e48dc9e7836; 48288e65b6a227b30f00dea46073840363b9fc2d;19777 -6af6602bcdb5227c51a6b467226d5fc70d321855; ead896de7fe9c9f235b720ed5f3bcf6d7877989b;19783 -4b51763bd75123f81f069bba1b873c4538776530; e2311ccf85cd092b2bac862d142e5ab028b571ed;19797 -d82708b47d89c008a20ce23ba23ce4aca80cf232; 86dd96c71327854f7dcd3a4c352446503134120d;19798 -8dcb60d4529dc5e0cf99729338e05869cf270c06; 6699b9f0df300c7c7280381e0fbbcf525f9f31e0;19839 +0e2b02ee88f46fc29f234c9c71800fcd6c3f250c;19184 +86c00d3f4a8f412ad1ea25b3fcbd0888213e0723;19286 +5db99eba906095eb11b3ea893b95301ba9d4;19386 +b11b50a4a522208ece0ca8aa09f493e68184c065;19450 +d9306778a6714c198a0b4385f57a1b7afbd4c3fc;19463 +9db0bcb131b8805c060ef2b35f30433d5f2d16ee;19471 +51a2d8caf35c0512efda85b11bf9a2c858ff0e77;19552 +24d99686c39438784e16e393feeb2c0d4572820a;19601 +4fe093009cdde828d4f8acc6e8fb3cf84ef2623b;19613 +b334467bc02e858e5ad01f18565c740b8458b858;19617 +13c8395e91b708bb045ad34da6bf52459e254287;19618 +71b6b0a21675828fb10df69a83f96988abf0021a;19637 +e974d0e833a02b40de938a22184c06e2ee9e0453;19638 +39b75b2eb605ab9cbe6364622a0bc32ba32f74dd;19652 +13dd9624b6aaf03a26c400c34494320b4223b91f;19669 +023369fd1ba2c63ef2a0fc973ad0283973033946;19672 +f1dc6d42b2b62013b7c83692922962d5a52c302c;19673 +c17ba8ddea5915f8c2c535cf121ff313c2c4d294;19706 +7ec21b4816510812a9a9ca0fd0c712bcfc5527f8;19709 +2b82299887068d18e9eeab288a825dce0603b29c;19724 +03ef287c9f854dcb2c5bad5bdecea2625e7f8bc3;19738 +b963ebd8d5c178f27c322c70b9dfd692f9a71640;19750 +1575b390eaee5f8a22aa24e45879beec0b92f223;19764 +b685aafbfa677f91822bf9fff3566efe28533c84;19771 +81d43f9bd341f538596d0d3622004965864fae12;19773 +7659837e02a36ce3171dd87f8bced3a0a252bbe1;19781 +0e3431831481521fe66ad6b4041a6a9129af2a09;19793 +58f8238edcf9b3846857af71727d0d1bc7e4bec4;19799 +67cde13525c50e995c07c1dfcf0ba1eb447e67b3;19815 +5ce7326cdfa96d00541253cf082735a2bc396b77;19835 +6949221976767b94b98694b73d2b35a12c66933f;19838 + + a7c85f280677d70b8eef9aadf79302736ed26ffc; f5a1b0037fec2927cba073d118db24cdbd681975; a098425430db227021617976961e6b51ce5569cb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[78282] brlcad/trunk/misc/repowork/repowork.cpp
Revision: 78282
http://sourceforge.net/p/brlcad/code/78282
Author: starseeker
Date: 2021-02-19 17:04:04 + (Fri, 19 Feb 2021)
Log Message:
---
Add a way to pass in a list of sha1 commits that were associated with SVN tags
rather than branches.
Modified Paths:
--
brlcad/trunk/misc/repowork/repowork.cpp
Modified: brlcad/trunk/misc/repowork/repowork.cpp
===
--- brlcad/trunk/misc/repowork/repowork.cpp 2021-02-19 15:50:58 UTC (rev
78281)
+++ brlcad/trunk/misc/repowork/repowork.cpp 2021-02-19 17:04:04 UTC (rev
78282)
@@ -86,7 +86,7 @@
std::string note((std::istreambuf_iterator(n)),
std::istreambuf_iterator());
// Replace git style branch name for master with SVN style name
- std::regex mstr_regex("svn:branch:master");
+ std::regex mstr_regex("svn:branch:master$");
std::string note_fixed = std::regex_replace(note, mstr_regex,
"svn:branch:trunk");
// Write the message to the commit's string;
@@ -130,7 +130,7 @@
}
int
-git_update_svnnotes(git_fi_data *s, std::string _rev_map, std::string
_branch_map)
+git_update_svnnotes(git_fi_data *s, std::string _rev_map, std::string
_branch_map, std::string _list)
{
if (!s->have_sha1s) {
@@ -149,6 +149,11 @@
std::cerr << "Could not open svn_branch_map file: " << svn_branch_map
<< "\n";
exit(-1);
}
+std::ifstream infile_tag_list(tag_list, std::ifstream::binary);
+if (tag_list.length() && !infile_tag_list.good()) {
+ std::cerr << "Could not open tag_list file: " << tag_list << "\n";
+ exit(-1);
+}
std::map rmap;
if (infile_revs.good()) {
@@ -202,7 +207,33 @@
infile_branches.close();
}
+std::set tag_sha1s;
+if (infile_tag_list.good()) {
+ std::string line;
+ while (std::getline(infile_tag_list, line)) {
+ // Skip anything the wrong length
+ if (line.length() != 40) {
+ continue;
+ }
+ tag_sha1s.insert(line);
+ std::cout << "tag sha1: " << line << "\n";
+ bool valid = false;
+ for (size_t i = 0; i < s->commits.size(); i++) {
+ if (s->commits[i].id.sha1 == line) {
+ valid = true;
+ break;
+ }
+ }
+ if (!valid) {
+ std::cout << "INVALID sha1 supplied for tag!\n";
+ }
+ }
+ infile_tag_list.close();
+}
+
+
+
// Iterate over the commits looking for note commits. If we find one,
// find its associated blob with data, read it, find the associated
// commit, and stash it in a string in that container.
@@ -213,10 +244,11 @@
}
int nrev = -2;
- bool sb = false;
+ bool sb = (bmap.find(s->commits[i].id.sha1) != bmap.end());
+ bool do_tag = (tag_sha1s.find(s->commits[i].id.sha1) !=
tag_sha1s.end());
std::string sbranch;
- if (rmap.find(s->commits[i].id.sha1) == rmap.end() &&
bmap.find(s->commits[i].id.sha1) == bmap.end()) {
+ if ((rmap.find(s->commits[i].id.sha1) == rmap.end()) && !sb && !do_tag)
{
continue;
}
@@ -224,9 +256,8 @@
nrev = rmap[s->commits[i].id.sha1];
}
- if (bmap.find(s->commits[i].id.sha1) != bmap.end()) {
+ if (sb) {
sbranch = bmap[s->commits[i].id.sha1];
- sb = true;
}
if (nrev > 0) {
@@ -311,11 +342,16 @@
if (sbranch.length()) {
// If we're adding/replacing rather than eliminating
// the branch line, add it now.
- std::string nbranchline = std::string("svn:branch:") +
sbranch;
- nmsg.append(nbranchline);
+ if (do_tag) {
+ std::string nbranchline = std::string("svn:tag:") +
sbranch;
+ nmsg.append(nbranchline);
+ } else {
+ std::string nbranchline =
std::string("svn:branch:") + sbranch;
+ nmsg.append(nbranchline);
+ }
nmsg.append("\n");
+ wbranch = true;
}
- wbranch = true;
if (sbmatch) {
// Replacing/removing existing branch line, no more to
be done.
continue;
@@ -323,6 +359,19 @@
}
}
+ if (do_tag) {
+ std::regex svnbranchline("^svn:branch:.*");
+ bool sbmatch = std::regex_match(cline, svnbranchline);
+ if (sbmatch) {
+ std::string tagname = cline.substr(11, std::string::npos);
+ std::cout << "branch->tag " << s->commits[i].id.sha1 << ","
<< tagname << "\n";
+
