Merge branch 'master' of ssh://ssh.ucc.asn.au/uccvend-docs

diff --git a/REPOSITORIES b/REPOSITORIES
index 26d0fdd..0609dbf 100644 (file)
--- a/REPOSITORIES
+++ b/REPOSITORIES
@@ -25,18 +25,16 @@ Name        :  virtualsnack
 URL    :  https://github.com/ucc/virtualsnack
 Content        :  Curses based emulator of the UCC Snack Machine ROM
 
-Name   : 
-URL    :
-URL    :
-Content        : 
+Name   :  uccvend-vendserver
+URL    :  git://git.ucc.asn.au/uccvend-vendserver.git 
+URL    :  http://git.ucc.asn.au/?p=uccvend-vendserver.git;a=summary
+Content :  Snack machine python code
+Notes  :  Migrated from dispense2
 
 
 Planned Repositories
 --------------------
 
-Name   :  uccvend-vendserver
-Content :  Snack machine python code
-
 Name   :  uccvend-snackrom
 Content :  Snack machine ROM code
 
@@ -92,22 +90,23 @@ URL :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/jabberdoor/
 Status :  Probably broken???   
 Content        :  UCC Door to jabber(XMPP) gateway
 
-Name   :  dispense2
-URL    :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/dispense2/
-Status :  Needs to be migrated
-Content        :  Contains Python Code for Snack machine, failed python dispense 
-           rewrite, bitrotted virtualvend
-
 Name   :  openvend
 URL    :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/openvend/
 Status :  Needs to be migrated
 Content        :  Contains C code for Snack ROM, scans of cokebrain new board
 
 
-
 Deprecated Repositories
 -----------------------
 
+Name   :  dispense2
+URL    :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/dispense2/
+Status :  Needs to be migrated
+Content        :  Contains Python Code for Snack machine, failed python dispense 
+           rewrite, bitrotted virtualvend
+Notes  :  Migrated to git.  uccvend-vendserver
+
+
 Name   :  zanchey/dispense2.git
 URL    :  http://git.ucc.asn.au/?p=zanchey/dispense2.git;a=summary
 Status :  Not authoritative.  Patches need to be copied out.

diff --git a/author-conv-file b/author-conv-file
new file mode 100644 (file)
index 0000000..b20fdff
--- /dev/null
+++ b/author-conv-file
@@ -0,0 +1,11 @@
+mtearle=Mark Tearle <[email protected]>
+dagobah=Bernard Blackham <[email protected]>
+root=ACC Murphy <[email protected]>
+tpg=John Hodge <[email protected]>
+cameron=Cameron Patrick <[email protected]>
+grahame=Grahame Bowland <[email protected]>
+matt=Matt Johnston <[email protected]>
+zanchey=David Adam <[email protected]>
+davidb=David Basden <[email protected]>
+nick=Nick Bannon <[email protected]>
+

diff --git a/doc/cvs-conversion-details b/doc/cvs-conversion-details
new file mode 100644 (file)
index 0000000..a77cfd2
--- /dev/null
+++ b/doc/cvs-conversion-details
@@ -0,0 +1,6 @@
+# for conversion of Door code to Git repo
+
+/home/other/cvs is a local copy of the UCC cvs repo
+/home/other/cvslock is a local dir for CVS locks
+
+git cvsimport -v -p x -A ~/hack/uccvend-docs/author-conv-file -d /home/other/cvs/ projects/dispense2/sql-edition/servers