Re: pending patches



Would it be possible to make all of the approved ones apply without
failed hunks?

If I need to patch them in a certain order, please add a number in front
of the filename.


ls /home/pvanhoof/approved/
[PATCH_02_18]_Give_tny_folder_store_get_folders_a_refresh_parameter.patch  [PATCH_07_18]Add_tny_camel_queue_stop.patch
[PATCH_05_18]_Attempt_to_fix_the_queue_account_refcount.patch
[PATCH_11_18]_Add_tny_camel_send_queue_new_with_folders.patch
[PATCH_06_18]_Fix_ref_leak_with_the_iter_store.patch
[PATCH_15_18]_In_TnyCamelFolder_don_t_emit_folder_store_change.patch
pvanhoof tinc:~/repos/tinymail/trunk$ 


pvanhoof tinc:~/repos/tinymail/trunk$ for a
in /home/pvanhoof/approved/*patch; do patch -p0 < "$a"; done
patching file libtinymail-camel/tny-camel-folder.c
patching file libtinymail-camel/tny-camel-folder.h
patching file libtinymail-camel/tny-camel-store-account.c
patching file libtinymail-camel/tny-camel-store-account.h
patching file ChangeLog
patching file libtinymail/tny-shared.h
patching file libtinymail/tny-combined-account.c
patching file libtinymail/tny-folder-store.c
patching file libtinymail/tny-folder-store.h
patching file libtinymail-camel/tny-camel-queue-priv.h
patching file libtinymail-camel/tny-camel-queue.c
patching file libtinymail-camel/tny-camel-store-account.c
Hunk #1 succeeded at 824 (offset -8 lines).
patching file libtinymail-camel/tny-camel-account.c
patching file libtinymail-camel/tny-camel-store-account.c
Hunk #1 FAILED at 1724.
1 out of 1 hunk FAILED -- saving rejects to file
libtinymail-camel/tny-camel-store-account.c.rej
patching file libtinymail-camel/tny-camel-queue-priv.h
patching file libtinymail-camel/tny-camel-queue.c
patching file libtinymail-camel/tny-camel-store-account.c
Hunk #2 succeeded at 868 (offset -8 lines).
Hunk #3 succeeded at 2371 (offset -82 lines).
patching file libtinymail-camel/tny-camel-account.c
patching file libtinymail-camel/tny-camel-account.h
patching file libtinymail-camel/tny-camel-send-queue.c
Hunk #1 succeeded at 1297 (offset -327 lines).
patching file libtinymail-camel/tny-camel-send-queue.h
patching file libtinymail-camel/tny-camel-folder.c
Hunk #1 FAILED at 6215.
1 out of 1 hunk FAILED -- saving rejects to file
libtinymail-camel/tny-camel-folder.c.rej
pvanhoof tinc:~/repos/tinymail/trunk$ 


On Thu, 2008-10-09 at 17:34 +0200, martin bonnin wrote:
> Hi,
> 
>    So I think I have them all ! To try keep it simple, I kept the
> numbering from Rob. Below some comments. The patch marked as
> "approved" had somehow a consensus on the mailing list so should be
> safe to commit. I let you decide for the others
> 
> *
> [PATCH_02_18]_Give_tny_folder_store_get_folders_a_refresh_parameter.patch
>     includes additionnal patch to make compile with -DDBC
>     => approved
> 
> * [PATCH_03_18]_New_observer_behaviour.patch
>     also includes the patch to adapt the rest of the code to the new
> api
>     some arguments from Sergio were answered by Rob
>     => waiting for a confirmation from Sergio
> 
> * [PATCH_05_18]_Attempt_to_fix_the_queue_account_refcount.patch
>     => approved
> 
> * [PATCH_06_18]_Fix_ref_leak_with_the_iter_store.patch
>    Sergio found a problem with the original patch
>    Discussed with Rob, the unref was indeed intented for iter_store
> and not store
>     => approved
> 
> * [PATCH_07_18]Add_tny_camel_queue_stop.patch
>    One remark from Sergio about a weird typedef but overall approved
>    => approved
> 
> *
> [PATCH_10_18]_Make_TnySendQueue_interface_depend_on_TnyFolderStore.patch
>    Original patch + renaming from observer-mixin.h to
> observer-mixin-priv.h
>    => waiting for more review
> 
> * [PATCH_11_18]_Add_tny_camel_send_queue_new_with_folders.patch
>    => approved
> 
> * [PATCH_12_18]_Create_TnyMergeFolderStore.patch
>    original patch + renaming from observer-mixin.h to
> observer-mixin-priv.h
>    => under discussion whether observer-mixin is a public or private
> type
> 
> * [PATCH_15_18]_In_TnyCamelFolder_don_t_emit_folder_store_change.patch
>   => approved
> 
> 
> We also have a new patch that has never been submitted to the ML. I'll
> wait a bit for the above to get reviewed/commited and will submit it a
> bit later. Tell me if you have any trouble.
> Happy hacking !
> 
> -- 
> Martin

-- 
Philip Van Hoof, freelance software developer
home: me at pvanhoof dot be 
gnome: pvanhoof at gnome dot org 
http://pvanhoof.be/blog
http://codeminded.be



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