Problem combining/merging patches.

Chris F.A. Johnson chris-E7bvbYbpR6jSUeElwK9/Pw at public.gmane.org
Mon May 2 18:58:31 UTC 2011


On Mon, 2 May 2011, Digimer wrote:

> Hi all,
>
>  I've got three patches that I am trying to merge into one patch.
> However, even using 'combinediff', kompare complains that the diff is
> malformed.
>
>  Could someone show me the magical incantation to merge these?
>
> http://alteeve.com/xen/patch1.patch
> http://alteeve.com/xen/patch2.patch
> http://alteeve.com/xen/patch3.patch
>
>  I'd like to merge them into:
>
> http://alteeve.com/xen/xen_match_vif_mtu_to_bridge_mtu.patch

    Apply the patches to a copy of the file, then do a diff of the file
    with and without the patches.

-- 
    Chris F.A. Johnson, <http://cfajohnson.com/>
    Author:
    Pro Bash Programming: Scripting the GNU/Linux Shell (2009, Apress)
    Shell Scripting Recipes: A Problem-Solution Approach (2005, Apress)
--
The Toronto Linux Users Group.      Meetings: http://gtalug.org/
TLUG requests: Linux topics, No HTML, wrap text below 80 columns
How to UNSUBSCRIBE: http://gtalug.org/wiki/Mailing_lists





More information about the Legacy mailing list