#
#
# patch "NEWS"
#  from [6ce10ecea1174838b3207675854c3cacf20cf9c8]
#    to [18fee5e50cd5dac4a9b98ab919f14d7c2a5c6b02]
# 
# patch "monotone.texi"
#  from [474ecd5f8c4bab15311547985c67b0d3f1780a0b]
#    to [ca5dafd6d7b81cc64d79537f3dd171a195530535]
# 
# patch "tests/log_--diffs/__driver__.lua"
#  from [734a972fa91ab98e63bf4c456e24653cfb5a258c]
#    to [fe0a57a96ed1a839b847e91abe1eb72203eb8b0f]
# 
# patch "tests/log_--diffs/expect_restrict"
#  from [80408e201c7d27941a2848f14e2fc8118818af6b]
#    to [8c333bf33df8074f758eb4db896641486d44062a]
#
============================================================
--- NEWS	6ce10ecea1174838b3207675854c3cacf20cf9c8
+++ NEWS	18fee5e50cd5dac4a9b98ab919f14d7c2a5c6b02
@@ -1,4 +1,4 @@
-afcxxx xxx xx xx:xx:xx UTC 2010
+xxx xxx xx xx:xx:xx UTC 2010
 
         0.48 release.
 
============================================================
--- monotone.texi	474ecd5f8c4bab15311547985c67b0d3f1780a0b
+++ monotone.texi	ca5dafd6d7b81cc64d79537f3dd171a195530535
@@ -3762,9 +3762,9 @@ @heading Existing control files and dire
 @item _MTN/commit
 If a commit fails, f.e. because a header field could not be parsed
 properly, then this file will contain a dump of the complete contents
-which have been saved through the editor.  After the information have been
-recovered from this file, it has to be removed explicitely, since a new commit
-won't be possible as long as this file exists.
+which have been saved through the editor.  After the information has
+been recovered from this file, it has to be removed explicitly, since
+a new commit won't be possible as long as this file exists.
 @item _MTN/inodeprints
 If this file exists, monotone considers the directory to be in
 @ref{Inodeprints} mode, and uses this file to cache the inodeprints.
============================================================
--- tests/log_--diffs/__driver__.lua	734a972fa91ab98e63bf4c456e24653cfb5a258c
+++ tests/log_--diffs/__driver__.lua	fe0a57a96ed1a839b847e91abe1eb72203eb8b0f
@@ -5,17 +5,14 @@ commit()
 addfile("bar", "bar\n")
 
 commit()
-REV1=base_revision()
 
 writefile("foo", "foo changed\n")
 
 commit()
-REV2=base_revision()
 
 addfile("quux", "quux\n")
 
 commit()
-REV3=base_revision()
 
 writefile("foo", "foo again\n")
 writefile("bar", "bar again\n")
@@ -23,7 +20,6 @@ commit()
 check(mtn("rename", "foo", "foo2"), 0, false, false)
 
 commit()
-REV4=base_revision()
 
 -- without restrictions
 check(mtn("log", "--diffs", "--no-graph"), 0, true, false)
@@ -34,18 +30,9 @@ check(samefile("expect_full", "full"))
 check(samefile("expect_full", "full"))
 
 -- restrict to foo2 and quux
-check(mtn("log", "--no-graph", "quux", "foo2", "--diffs", "--from", REV4, "--to", REV1), 0, true, false)
+check(mtn("log", "--no-graph", "quux", "foo2", "--diffs"), 0, true, false)
 check(grep("^(---|\\+\\+\\+) ", "stdout"), 0, true, false)
 rename("stdout", "restrict")
 check(get("expect_restrict"))
 canonicalize("restrict")
 check(samefile("expect_restrict", "restrict"))
-
--- this fails because restricting to quux and foo2 excludes the
--- addition of the root dir in the initial revision.
-
--- the solution here is probably to make the restrictions code implicitly
--- include the parents, non-recursively, of all explicitly included nodes
--- then the parent rename would be included here and the diff would work.
-
-xfail(mtn("log", "-r", REV1, "quux", "foo2", "--diffs"), 0, false, false)
============================================================
--- tests/log_--diffs/expect_restrict	80408e201c7d27941a2848f14e2fc8118818af6b
+++ tests/log_--diffs/expect_restrict	8c333bf33df8074f758eb4db896641486d44062a
@@ -4,3 +4,5 @@
 +++ quux	f3d9ae4aeea6946a8668445395ba10b7399523a0
 --- foo	f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
 +++ foo	5527e63e7193ef5fadbc8fd40cc8092d742602e7
+--- /dev/null	
++++ foo	f1d2d2f924e986ac86fdf7b36c94bcdf32beec15