Re: Cannot compile JobScheduler patch

[Bengt Thuree <bengt thuree com>]

On Fri, 2006-10-06 at 22:27 +0200, Dotan Cohen wrote:
> 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
This is bad!
Changelog failure do not mean anything, all others usually do.

> patching file libgphoto2-sharp/Makefile.am
> patching file semweb/Makefile.am
> Hunk #1 succeeded at 1 with fuzz 1.
Fuzz means that the original code was changed since the patch was made,
but cvs found a very matching code (apart from first or last line (fuzz
1)and  applied the patch there.

> 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
Again, this one failed, and needs to be manually corrected.
This can be done by
1) Checking the <file>.rej file, and applying the changes manually, or
2) Check the original patch file, and check each entry for the <file> in
question and ensure each patch is done. I usually find this easier.

> patching file src/Makefile.am
> Reversed (or previously applied) patch detected!  Assume -R? [n]
Patch has already been applied.

> 
> 
> 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).
Found a perfect matching part, but a bit further down since the original
code was changed.

> 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
> _______________________________________________
> F-spot-list mailing list
> F-spot-list gnome org
> http://mail.gnome.org/mailman/listinfo/f-spot-list
>