Revision: 72261
http://sourceforge.net/p/brlcad/code/72261
Author: starseeker
Date: 2019-01-25 03:23:02 +0000 (Fri, 25 Jan 2019)
Log Message:
-----------
tweak svn2git rules for repos other than the main one. geomcore needs some
special care due to starting life as a branch of rt3.
Modified Paths:
--------------
brlcad/trunk/misc/CMakeLists.txt
brlcad/trunk/misc/repoconv/svn2git/rules
Added Paths:
-----------
brlcad/trunk/misc/repoconv/svn2git/rules-geomcore
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2019-01-25 02:24:46 UTC (rev 72260)
+++ brlcad/trunk/misc/CMakeLists.txt 2019-01-25 03:23:02 UTC (rev 72261)
@@ -123,6 +123,7 @@
repoconv/svn2git/account-map
repoconv/svn2git/archive_branches.sh
repoconv/svn2git/rules
+ repoconv/svn2git/rules-geomcore
repoconv/svn2git/svn-fast-export/CMake/FindAPR.cmake
repoconv/svn2git/svn-fast-export/CMake/FindSubversionLibrary.cmake
repoconv/svn2git/svn-fast-export/CMakeLists.txt
Modified: brlcad/trunk/misc/repoconv/svn2git/rules
===================================================================
--- brlcad/trunk/misc/repoconv/svn2git/rules 2019-01-25 02:24:46 UTC (rev
72260)
+++ brlcad/trunk/misc/repoconv/svn2git/rules 2019-01-25 03:23:02 UTC (rev
72261)
@@ -8,9 +8,6 @@
create repository rt_3
end repository
-create repository geomcore
-end repository
-
create repository iBME
end repository
@@ -81,9 +78,21 @@
# these it's not worth bothering
# with branches and tags - at least,
# not yet.
+match /osl/branches/([^/]+)/
+ repository osl
+ branch \1
+end match
+match /osl/tags/([^/]+)/
+ repository osl
+ branch tag--\1
+end match
+match /osl/trunk/
+ repository osl
+ branch master
+end match
match /osl/
repository osl
- branch osl
+ branch master
end match
match /rt\^3/branches/([^/]+)/
@@ -96,48 +105,131 @@
branch tag--\1
substitute branch s/\^/_/
end match
+match /rt\^3/trunk/
+ repository rt_3
+ branch master
+end match
match /rt\^3/
repository rt_3
branch master
end match
+match /ova/branches/([^/]+)/
+ repository ova
+ branch \1
+end match
+match /ova/tags/([^/]+)/
+ repository ova
+ branch tag--\1
+end match
+match /ova/trunk/
+ repository ova
+ branch master
+end match
match /ova/
repository ova
branch master
end match
+match /iBME/branches/([^/]+)/
+ repository iBME
+ branch \1
+end match
+match /iBME/tags/([^/]+)/
+ repository iBME
+ branch tag--\1
+end match
+match /iBME/trunk/
+ repository iBME
+ branch master
+end match
match /iBME/
repository iBME
branch master
end match
+match /isst/branches/([^/]+)/
+ repository isst
+ branch \1
+end match
+match /isst/tags/([^/]+)/
+ repository isst
+ branch tag--\1
+end match
+match /isst/trunk/
+ repository isst
+ branch master
+end match
match /isst/
repository isst
branch master
end match
+match /jbrlcad/branches/([^/]+)/
+ repository jbrlcad
+ branch \1
+end match
+match /jbrlcad/tags/([^/]+)/
+ repository jbrlcad
+ branch tag--\1
+end match
+match /jbrlcad/trunk/
+ repository jbrlcad
+ branch master
+end match
match /jbrlcad/
repository jbrlcad
branch master
end match
+match /web/branches/([^/]+)/
+ repository web
+ branch \1
+end match
+match /web/tags/([^/]+)/
+ repository web
+ branch tag--\1
+end match
+match /web/trunk/
+ repository web
+ branch master
+end match
match /web/
repository web
branch master
end match
+match /webcad/branches/([^/]+)/
+ repository webcad
+ branch \1
+end match
+match /webcad/tags/([^/]+)/
+ repository webcad
+ branch tag--\1
+end match
+match /webcad/trunk/
+ repository webcad
+ branch master
+end match
match /webcad/
repository webcad
branch master
end match
-match /rtcmp/
+match /rtcmp/branches/([^/]+)/
repository rtcmp
+ branch \1
+end match
+match /rtcmp/tags/([^/]+)/
+ repository rtcmp
+ branch tag--\1
+end match
+match /rtcmp/trunk/
+ repository rtcmp
branch master
end match
-
-match /geomcore/
- repository geomcore
+match /rtcmp/
+ repository rtcmp
branch master
end match
Added: brlcad/trunk/misc/repoconv/svn2git/rules-geomcore
===================================================================
--- brlcad/trunk/misc/repoconv/svn2git/rules-geomcore
(rev 0)
+++ brlcad/trunk/misc/repoconv/svn2git/rules-geomcore 2019-01-25 03:23:02 UTC
(rev 72261)
@@ -0,0 +1,53 @@
+# geomcore combines its own history with some
+# of rt3 - handle separately
+create repository geomcore
+end repository
+
+match /rt\^3/branches/([^/]+)/
+ min revision 1
+ max revision 43109
+ repository geomcore
+ branch \1
+ substitute branch s/\^/_/
+end match
+match /rt\^3/tags/([^/]+)/
+ min revision 1
+ max revision 43109
+ repository geomcore
+ branch tag--\1
+ substitute branch s/\^/_/
+end match
+match /rt\^3/trunk/
+ min revision 1
+ max revision 43109
+ repository geomcore
+ branch master
+end match
+match /rt\^3/
+ min revision 1
+ max revision 43109
+ repository geomcore
+ branch master
+end match
+
+match /geomcore/branches/([^/]+)/
+ repository geomcore
+ branch \1
+end match
+match /geomcore/tags/([^/]+)/
+ repository geomcore
+ branch tag--\1
+end match
+match /geomcore/trunk/
+ repository geomcore
+ branch master
+end match
+match /geomcore/
+ repository geomcore
+ branch master
+end match
+
+# Ignore everything else
+match /
+end match
+
Property changes on: brlcad/trunk/misc/repoconv/svn2git/rules-geomcore
___________________________________________________________________
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
