[Monotone-commits-diffs] org.debian.monotone: a43b0aa4dc25a6160691347cbfa8bee43650c6c0

[code]

revision:            a43b0aa4dc25a6160691347cbfa8bee43650c6c0
date:                2013-07-16T21:24:04
author:              address@hidden
branch:              org.debian.monotone
changelog:
* patches/09-ignore-aggressive-gnu-patch.diff: added to allow a test to pass
  in the face of a newer GNU patch version.
* debian/series: adjusted, reordered to match numbering
* debian/changelog: adjusted, minor tweaking.

manifest:
format_version "1"

new_manifest [b036fdda5d2d01643dc7a812612b435e8c296864]

old_revision [77b4ea6812650f8c38a0f43a57b804d4a3dd80ea]

add_file "patches/09-ignore-aggressive-gnu-patch.diff"
 content [81ec045b4d071863eebe6adc12d7478667e38f04]

patch "changelog"
 from [b338366c3c66962bc5e02cd14d79dbae4880e500]
   to [79663cd43a7869b6b8330218844da847e1c9f63f]

patch "patches/series"
 from [17ff0966a419e398ba21252c4236f9fd684d6e1e]
   to [edec63dd900143d06ac59165dd82868e9ba29676]
============================================================
--- changelog	b338366c3c66962bc5e02cd14d79dbae4880e500
+++ changelog	79663cd43a7869b6b8330218844da847e1c9f63f
@@ -1,8 +1,10 @@ monotone (1.0-9) unstable; urgency=low
 monotone (1.0-9) unstable; urgency=low
 
-  * Add patches/08-texinfo-fix.diff. Closes: #712340.
+  * Add patches/08-texinfo-fix.diff. Sanitizes .texi files. Closes: #712340.
+  * Add patches/09-ignore-aggressive-gnu-patch.diff to allow a test to
+    pass in the face of a newer GNU patch version.
 
- -- Markus Wanner <address@hidden>  Tue, 16 Jul 2013 22:28:42 +0200
+ -- Markus Wanner <address@hidden>  Tue, 16 Jul 2013 23:57:44 +0200
 
 monotone (1.0-8) unstable; urgency=low
 
============================================================
--- /dev/null	
+++ patches/09-ignore-aggressive-gnu-patch.diff	81ec045b4d071863eebe6adc12d7478667e38f04
@@ -0,0 +1,22 @@
+Description: fix functional test diff_patch_drop
+ Old GNU patch versions were a bit aggressive and removed an empty directory,
+ where they should have removed only the file. Let's not rely on that and
+ allow the test to pass with newer GNU patch versions that behave better.
+Origin: upstream, commit: f79d8215061cd57a97ecfe3bd02a7748ff605cf5
+Author: Markus Wanner <address@hidden>
+--- a/test/func/diff_patch_drop/__driver__.lua
++++ b/test/func/diff_patch_drop/__driver__.lua
+@@ -32,9 +32,10 @@
+     check({"patch", "-p0", "-E"}, 0, false, false, true)
+     check(not exists("dir/file"))
+ else
+-    -- GNU patch should only remove the file
+-    -- but it is a little aggressive and removes the dir too!
+     check({"patch", "-p0"}, 0, false, false, true)
+     check(not exists("dir/file"))
+-    check(not exists("dir"))
++
++    -- GNU patch should only remove the file but older versions may be a
++    -- little aggressive and remove the dir too! We test monotone, here,
++    -- so we shouldn't care whether or not "dir" still exists.
+ end
============================================================
--- patches/series	17ff0966a419e398ba21252c4236f9fd684d6e1e
+++ patches/series	edec63dd900143d06ac59165dd82868e9ba29676
@@ -6,6 +6,7 @@ 07-support-boost-1.53.diff
 05-hurd-compilation-fix.diff
 06-broken-dns-work-around.diff
 07-support-boost-1.53.diff
-10-mtn-ignore-syntax-error-test.diff
 08-texinfo-fix.diff
+09-ignore-aggressive-gnu-patch.diff
+10-mtn-ignore-syntax-error-test.diff
 90-stacktrace-on-crash.diff