Problem combining/merging patches.

Digimer linux-5ZoueyuiTZhBDgjK7y7TUQ at public.gmane.org
Mon May 2 20:31:10 UTC 2011


On 05/02/2011 03:01 PM, Lennart Sorensen wrote:
> On Mon, May 02, 2011 at 01:17:47PM -0400, Digimer wrote:
>>   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
> 
> That patch is already exactly the other three patches combined.
> 
> Since they are three patches that apply to three seperate files,
> combinediff isn't needed.  Just cat'ing them together is fine, which is
> what that last patch already is.

Maybe it's a bug in 'kompare' then... Thanks. :)

-- 
Digimer
E-Mail: digimer-5ZoueyuiTZhBDgjK7y7TUQ at public.gmane.org
AN!Whitepapers: http://alteeve.com
Node Assassin:  http://nodeassassin.org
--
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