Cannot compile JobScheduler patch



When I try to test the JobScheduler patch on a fresh CVS on a brand
new test user, I get this:

user ubuntu:~/development/f-spot/f-spot$ patch -p0 < thepatch.diff
patching file .bzrignore
patching file src/JobScheduler.cs
patching file FlickrNet/Makefile.am
patching file configure.in
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
patching file libgphoto2-sharp/Makefile.am
patching file semweb/Makefile.am
Hunk #1 succeeded at 1 with fuzz 1.
patching file src/Core.cs
patching file src/Db.cs
patching file src/ImportStore.cs
patching file src/MainWindow.cs
Hunk #1 FAILED at 18.
Hunk #2 succeeded at 477 (offset 20 lines).
Hunk #3 succeeded at 2895 (offset 183 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/MainWindow.cs.rej
patching file src/Makefile.am
Reversed (or previously applied) patch detected!  Assume -R? [n]


So I just hit enter for the default of N. Twice. This is how it continued:


Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file src/Makefile.am.rej
patching file src/MetaStore.cs
patching file src/PhotoStore.cs
Hunk #2 succeeded at 652 (offset 6 lines).
Hunk #3 succeeded at 669 (offset 6 lines).
Hunk #4 succeeded at 696 (offset 6 lines).
Hunk #5 succeeded at 720 (offset 6 lines).
Hunk #6 succeeded at 778 (offset 6 lines).
Hunk #7 succeeded at 803 (offset 6 lines).
Hunk #8 succeeded at 837 (offset 6 lines).
Hunk #9 succeeded at 864 (offset 6 lines).
Hunk #10 succeeded at 885 (offset 6 lines).
Hunk #11 succeeded at 900 (offset 6 lines).
Hunk #12 succeeded at 914 (offset 6 lines).
Hunk #13 succeeded at 926 (offset 6 lines).
Hunk #14 succeeded at 965 (offset 6 lines).
Hunk #15 succeeded at 1005 (offset 6 lines).
Hunk #16 succeeded at 1036 (offset 6 lines).
Hunk #17 succeeded at 1078 (offset 6 lines).
Hunk #18 succeeded at 1116 (offset 6 lines).
Hunk #19 succeeded at 1354 (offset 17 lines).
patching file src/TagCommands.cs
patching file src/TagStore.cs
patching file src/Updater.cs
user ubuntu:~/development/f-spot/f-spot$

Should I assume that the patch will work? What is meant by "fuzz 1"?
Did I do anything wrong?

Dotan Cohen
http://gmail-com.com
67



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]