# 
# 
# patch "common.py"
#  from [ec4c49fe7950195f6897ce813aafdbe043b1154c]
#    to [6f687dd25479ed455e662fa8566f182788ab31cc]
# 
# patch "revision.psp"
#  from [77bab654be272a249a635cf03c34f88aed76a042]
#    to [555b392e442ff4fc400780c7be5984371e355170]
# 
============================================================
--- common.py	ec4c49fe7950195f6897ce813aafdbe043b1154c
+++ common.py	6f687dd25479ed455e662fa8566f182788ab31cc
@@ -21,7 +21,11 @@
 		rv += '</a>]'
 		return rv
 	elif link_type == "diff":
-		rv = '<a href="getdiff.py?id1=%s&id2=%s">' % (urllib.quote(link_to[0]), urllib.quote(link_to[1]))
+		link_to = map(urllib.quote, link_to)
+		uri = 'getdiff.py?id1=%s&id2=%s' % (link_to[0], link_to[1])
+		if len(link_to) == 3:
+			uri += '&fname=%s' % (link_to[2])
+		rv = '<a href="' + uri + '">'
 		if description != None: rv += hq(description)
 		else: rv += "diff"
 		rv += '</a>'
============================================================
--- revision.psp	77bab654be272a249a635cf03c34f88aed76a042
+++ revision.psp	555b392e442ff4fc400780c7be5984371e355170
@@ -76,7 +76,8 @@
 			if not from_id:
 				value += 'Add file %s with revision %s<br />' % (hq(fname), link("file", [to_id, fname]))
 			else:
-				value += 'Patch file %s from %s to %s (%s) <br />' % (hq(fname), link("file", [from_id, fname]), link("file", [to_id, fname]), link("diff", [from_id, to_id]))
+				# possible bug here; we might need N diff links where N is the number of ancestors
+				value += 'Patch file %s from %s to %s (%s) <br />' % (hq(fname), link("file", [from_id, fname]), link("file", [to_id, fname]), link("diff", [old_revision, id, fname]))
 		elif type == "old_revision":
 			old_revision, old_manifest = stanza[0][1], stanza[1][1]
 			value += 'Old revision is: %s (%s)<br />Old manifest: %s<br />' % (link("revision", old_revision), link("diff", [old_revision, id]), hq(old_manifest))