Ticket #1245: notification_patch_applying_results.txt

File notification_patch_applying_results.txt, 2.6 KB (added by leavengood, 8 years ago)

Results of trying to apply notifications1.patch to hrev42239

Line 
1/Data/develop/haiku_svn/trunk> patch -p1 < ~/Desktop/notifications1.patch
2patching file headers/os/app/Notification.h
3patching file headers/os/app/Roster.h
4patching file headers/private/notification/AppUsage.h
5patching file headers/private/notification/Notifications.h
6patching file src/bin/notify.cpp
7patching file src/kits/app/Jamfile
8patching file src/kits/app/Notification.cpp
9Hunk #2 FAILED at 13.
10Hunk #3 succeeded at 110 (offset 1 line).
11Hunk #5 succeeded at 263 (offset 1 line).
12Hunk #7 succeeded at 307 (offset 1 line).
13Hunk #9 succeeded at 448 (offset 1 line).
141 out of 10 hunks FAILED -- saving rejects to file src/kits/app/Notification.cpp.rej
15patching file src/kits/app/Roster.cpp
16Hunk #1 succeeded at 37 (offset 1 line).
17patching file src/kits/notification/AppUsage.cpp
18patching file src/kits/notification/Notifications.cpp
19patching file src/preferences/notifications/DisplayView.cpp
20Reversed (or previously applied) patch detected!  Assume -R? [n]
21Apply anyway? [n]
22Skipping patch.
235 out of 5 hunks ignored -- saving rejects to file src/preferences/notifications/DisplayView.cpp.rej
24patching file src/preferences/notifications/DisplayView.h
25patching file src/servers/notification/AppGroupView.cpp
26patching file src/servers/notification/AppGroupView.h
27patching file src/servers/notification/Jamfile
28Hunk #1 FAILED at 1.
291 out of 1 hunk FAILED -- saving rejects to file src/servers/notification/Jamfile.rej
30patching file src/servers/notification/NotificationServer.cpp
31patching file src/servers/notification/NotificationServer.h
32patching file src/servers/notification/NotificationView.cpp
33Hunk #9 FAILED at 220.
34Hunk #11 FAILED at 292.
35Hunk #12 succeeded at 312 (offset -5 lines).
36Hunk #13 FAILED at 326.
37Hunk #15 succeeded at 445 (offset -5 lines).
38Hunk #17 succeeded at 480 (offset -5 lines).
39Hunk #19 succeeded at 520 (offset -5 lines).
403 out of 20 hunks FAILED -- saving rejects to file src/servers/notification/NotificationView.cpp.rej
41patching file src/servers/notification/NotificationView.h
42patching file src/servers/notification/NotificationWindow.cpp
43Hunk #1 FAILED at 15.
44Hunk #2 succeeded at 140 (offset 12 lines).
45Hunk #3 FAILED at 171.
46Hunk #4 succeeded at 227 (offset 2 lines).
47Hunk #5 FAILED at 292.
48Hunk #6 FAILED at 327.
49Hunk #7 FAILED at 361.
50Hunk #8 FAILED at 405.
51Hunk #9 succeeded at 429 (offset 11 lines).
52Hunk #10 succeeded at 467 (offset 3 lines).
53Hunk #11 succeeded at 520 (offset 11 lines).
54Hunk #12 FAILED at 529.
55Hunk #13 succeeded at 557 (offset 4 lines).
56Hunk #14 FAILED at 570.
578 out of 14 hunks FAILED -- saving rejects to file src/servers/notification/NotificationWindow.cpp.rej
58patching file src/servers/notification/NotificationWindow.h