Mike DePaulo
2018-06-05 04:45:52 UTC
I am attempting to do some triaging of bugs with patches.
This one no longer applies to master.
***@executor /cygdrive/c/x2gobuilds/x2goclient/src
$ patch < /cygdrive/c/Users/Mike.AD/Downloads/0001-Make-application-suspend-session-on-quit.patch
patching file onmainwindow.cpp
Hunk #1 FAILED at 100.
Hunk #2 succeeded at 862 (offset 69 lines).
Hunk #3 succeeded at 1141 (offset 77 lines).
Hunk #4 FAILED at 1237.
Hunk #5 FAILED at 1403.
Hunk #6 FAILED at 1429.
Hunk #7 succeeded at 5115 (offset 649 lines).
4 out of 7 hunks FAILED -- saving rejects to file onmainwindow.cpp.rej
patching file onmainwindow.h
Hunk #1 succeeded at 613 (offset 51 lines).
Hunk #2 FAILED at 876.
Hunk #3 succeeded at 1101 (offset 91 lines).
1 out of 3 hunks FAILED -- saving rejects to file onmainwindow.h.rej
This one no longer applies to master.
***@executor /cygdrive/c/x2gobuilds/x2goclient/src
$ patch < /cygdrive/c/Users/Mike.AD/Downloads/0001-Make-application-suspend-session-on-quit.patch
patching file onmainwindow.cpp
Hunk #1 FAILED at 100.
Hunk #2 succeeded at 862 (offset 69 lines).
Hunk #3 succeeded at 1141 (offset 77 lines).
Hunk #4 FAILED at 1237.
Hunk #5 FAILED at 1403.
Hunk #6 FAILED at 1429.
Hunk #7 succeeded at 5115 (offset 649 lines).
4 out of 7 hunks FAILED -- saving rejects to file onmainwindow.cpp.rej
patching file onmainwindow.h
Hunk #1 succeeded at 613 (offset 51 lines).
Hunk #2 FAILED at 876.
Hunk #3 succeeded at 1101 (offset 91 lines).
1 out of 3 hunks FAILED -- saving rejects to file onmainwindow.h.rej