From 2e2e8e70dd1d71dfb622b7af5ac389f73682e314 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 22 Apr 2009 03:57:17 +0200
Subject: [PATCH] +

---
 CHANGESTODO | 12 ++++++++++++
 bin/psyconf |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGESTODO b/CHANGESTODO
index 3300ab8..aa0333d 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -6,6 +6,9 @@ Essentially: whenever you fix something, move that line to the end of file.
 ________________________________________________________________________
 == NEXT RELEASE ========================================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+- autorefetch twitter isnt working
+  http/fetch is too complicated. throw out the queue and callback logic. kiss!
+
 ? support tls multiplexing on all suitable ports
 
 ? bugs in psyced install procedure
@@ -56,6 +59,7 @@ ________________________________________________________________________
 - the linking blues...
 	tgX sagt: on reconnect i didn't get any _echo_place_enter_login's from this room, then no response for _request_do_enter, and after a _request_do_leave i get replies for enter/leave but instead of _echo_place_enter/leave i get _notice_place_enter/leave
 
+? should /load inform that errors go to the console?
 ________________________________________________________________________
 == psyced 1.0 ==========================================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@@ -3916,3 +3920,11 @@ spyc/* psyc/*
 install.sh
 +	don't leave _host_IP uncommented
 +	mkdir data/* log/*
+=== 200904 ============================================================
+net/twitter
++	polly: periodically fetch updates from a twitter account and distribute to
+	hundreds of newsfeed contexts
++	listing: provide a listing of subscribed feeds
+http/fetch
+-	minor api cleanups to serve a more generic job
+
diff --git a/bin/psyconf b/bin/psyconf
index 7b4d5ab..e84a32b 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -489,6 +489,10 @@ fi
 
 if test "\$1" = "-m"
 then
+    # git is seriously unsuited for this job. we need to "check in" the changes
+    # to file permissions etc or otherwise we can't update things at all...
+    (cd $base && git commit -a -m 'automatic by psyced -m')
+    # merging will of course fail.. sigh
     (cd $base && git merge -s resolve origin)
     exit
 fi