monotone

monotone Commit Details

Date:2013-07-16 23:24:04 (5 years 11 months ago)
Author:Markus Wanner
Branch:org.debian.monotone
Commit:a43b0aa4dc25a6160691347cbfa8bee43650c6c0
Parents: 77b4ea6812650f8c38a0f43a57b804d4a3dd80ea
Message:* 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.
Changes:
Apatches/09-ignore-aggressive-gnu-patch.diff (full)
Mchangelog (1 diff)
Mpatches/series (1 diff)

File differences

changelog
11
22
3
3
4
5
46
5
7
68
79
810
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 <markus@bluegap.ch> Tue, 16 Jul 2013 22:28:42 +0200
-- Markus Wanner <markus@bluegap.ch> Tue, 16 Jul 2013 23:57:44 +0200
monotone (1.0-8) unstable; urgency=low
patches/09-ignore-aggressive-gnu-patch.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
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 <markus@bluegap.ch>
--- 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
66
77
88
9
109
10
11
1112
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

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status