RE: [Quilt-dev] how to merge patches?

[Raj, Ashok]

Sorry to reply to my own :-(

Seems like quilt fold will work, just I need to remove the entry from
series file?

Cheers,
ashok raj
- Open Source Technology Center
   


>-----Original Message-----
>From: address@hidden
[mailto:quilt-dev-
>address@hidden On Behalf Of Raj, Ashok
>Sent: Friday, September 02, 2005 2:45 PM
>To: address@hidden
>Subject: [Quilt-dev] how to merge patches?
>
>Hello
>
>I see 2 different --combine-patch option with quilt diff, and quilt
>files option.
>
>If I already have patch 1,2,3 applied, what is the best way to merge
say
>patch 2,3?
>
>Its not clear if I should first do a quilt diff --combine-patch p3 when
>p1,p2 is applied and p3 is not applied.
>
>Save this new diff output which is merged diff
>
>Then I drop p2 and include the combined patch?
>
>Akpm tools had a --join-patch option, just looking for something like
>that...
>
>Thanks in advance for any pointers.
>
>
>Cheers,
>ashok raj
>- Open Source Technology Center
>
>
>
>
>
>_______________________________________________
>Quilt-dev mailing list
>address@hidden
>http://lists.nongnu.org/mailman/listinfo/quilt-dev