From 8b8cd94ec044232caf82193889327e5487f8ee16 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Mon, 2 Mar 2009 21:28:36 +0100
Subject: [PATCH] pkggen to git

---
 CHANGESTODO      |  9 ++++++---
 utility/pkggen.c | 20 +++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index ac0c04e..f8142a7 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -6,9 +6,6 @@ Essentially: whenever you fix something, move that line to the end of file.
 ________________________________________________________________________
 == currently being inspected ===========================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
-- when a jabber clients disconnects and reconnects quickly, before the sane
-  quit delay has operated, it will not be given other people's presence again.
-
 + should ignored people receive an echo for the sake of not being
   distinguishable from not ignored people? yes...
 
@@ -3919,6 +3916,12 @@ install.sh
 === 200902 ============================================================
 archetype
 +	when joe says "/nick joe" it is understood as removing the /nick
+net/user
+-	by default we no longer support /set multiplace
+-	removed old _prefix code
+=== 200903 ============================================================
 jabber/user
 -	fixed major bug in output of presence state (showFriends)
 -	fixed outgoing presence support (announce)
+pkggen
++	ported from cvs to git
diff --git a/utility/pkggen.c b/utility/pkggen.c
index 0b334a4..2f7d717 100644
--- a/utility/pkggen.c
+++ b/utility/pkggen.c
@@ -13,7 +13,7 @@
 
 #define unless(x)	if (!(x))
 
-void cvscp(char *filename) {
+void vcscp(char *filename) {
     char cmdline[1000];
     printf(">>> %s\n", filename);
 
@@ -115,12 +115,18 @@ int main(int argc, char **argv) {
        hmm, doesn't really work like that
      */
 
-    puts(">> Now is your chance to inspect a cvs diff. Suspend now.");
+    puts(">> Doing a git fetch");
+    if (system("git fetch origin")) {
+	puts(">> Error during git fetch. Exiting.");
+	return 1;
+    }
+
+    puts(">> Now is your chance to inspect a 'git diff master..origin/master'. Suspend now.");
     sleep(4);
 
-    puts(">> Doing a CVS update");
-    if (system("cvs -q update -dP")) {
-	puts(">> Error during CVS update. Exiting.");
+    puts(">> Doing a git merge");
+    if (system("git merge -s resolve origin")) {
+	puts(">> Error during git merge. Exiting.");
 	return 1;
     }
 
@@ -138,9 +144,9 @@ int main(int argc, char **argv) {
 	return 1;
     }
 
-    puts(">> Updating files from CVS");
+    puts(">> Updating files from version control system");
 
-    cvscp("install.sh");
+    vcscp("install.sh");
 
     puts(">> Cleaning up data/");
     chdir("..");