echo Patch DSS-v6_0_3-Config diff Patch DSS-v6_0_3-Config diff usr bin

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
+ echo 'Patch #0 (DSS-v6_0_3-Config.diff):'
Patch #0 (DSS-v6_0_3-Config.diff):
+ /usr/bin/patch -p1
patching file ReleaseNotes.txt
patching file StreamingProxy.tproj/StreamingProxy.html
patching file StreamingProxy.tproj/streamingproxy.conf
patching file WebAdmin/streamingadminserver.conf
patching file qtaccess
patching file streamingserver.xml
Hunk #5 succeeded at 365 (offset 3 lines).
Hunk #6 succeeded at 397 (offset 3 lines).
Hunk #7 succeeded at 519 (offset 3 lines).
Hunk #8 succeeded at 531 (offset 3 lines).
patching file streamingserver.xml-POSIX
Hunk #2 succeeded at 88 with fuzz 2.
Hunk #4 succeeded at 297 (offset 4 lines).
Hunk #5 succeeded at 371 (offset 7 lines).
Hunk #6 succeeded at 403 (offset 7 lines).
Hunk #7 succeeded at 525 (offset 7 lines).
Hunk #8 succeeded at 537 (offset 7 lines).
но ВНЕЗАПНО:
thresh@snowwhite projects/darwinss/DarwinStreamingServer $ git apply -p1 ../DSS-v6_0_3-Config.diff
error: patch failed: DarwinStreamingServer/streamingserver.xml-POSIX:88
error: DarwinStreamingServer/streamingserver.xml-POSIX: patch does not apply