# 
# 
# patch "monotone.py"
#  from [2dff75c63bf007f86d0b3806c5a085890d27757f]
#    to [db94b133c60582cc38327251327147bcf5f2f461]
# 
# patch "wrapper.py"
#  from [779e74e244af2e8e5b0e0cac652771f5e230e66b]
#    to [7da9c82850b0b6a65f6c4f071e4289a48a34c2f8]
# 
============================================================
--- monotone.py	2dff75c63bf007f86d0b3806c5a085890d27757f
+++ monotone.py	db94b133c60582cc38327251327147bcf5f2f461
@@ -99,16 +99,18 @@
 		entry = None
 		for line in utility.iter_command(self.base_command + " log %s" % (pipes.quote(id))):
 			if dash_re.match(line):
-				print "dash"
 				entry = {}
-			elif entry != None:
-				if not line:
-					rv.append(entry)
-					entry = None
-					if limit > 0 and len(rv) >= limit: break
-				else:
-					m = log_entry_re.match(line)
-					if m: entry[m.groups()[0]] = m.groups()[1]
+			if entry == None: continue
+			if not line:
+				rv.append(entry)
+				entry = None
+				if limit > 0 and len(rv) >= limit: break
+				continue
+			m = log_entry_re.match(line)
+			if m:
+				attr, value = m.groups()
+				if not entry.has_key(attr): entry[attr] = []
+				entry[attr].append(value)
 		if entry: rv.append(entry)
 		return rv
 
============================================================
--- wrapper.py	779e74e244af2e8e5b0e0cac652771f5e230e66b
+++ wrapper.py	7da9c82850b0b6a65f6c4f071e4289a48a34c2f8
@@ -22,6 +22,7 @@
 	return apache.OK
 
 def get_tar(req):
+	"make a tar file out of a given manifest ID"
 	class DummyFile:
 		def __init__(self, buf):
 			self.buf = buf
@@ -34,7 +35,6 @@
 			return rv
 		def write(self, s):
 			self.buf += s
-	"make a tar file out of a given manifest ID"
 	mt = Monotone(config.monotone, config.dbfile) 
 	form = util.FieldStorage(req)
 	if not form.has_key('id'):