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

[Yasushi SHOJI]

At Sat, 3 Sep 2005 11:30:00 +0200,
jerome lacoste wrote:
> 
> On 9/3/05, Jean Delvare <address@hidden> wrote:
> > Hi Ashok,
> > 
> > [Ashok Raj]
> > > Seems like quilt fold will work, just I need to remove the entry from
> > > series file?
> > 
> > Yup, quilt fold is what you need if you want to merge several patches
> > into one. Assuming that you have patches 1, 2 and 3 applied, and want to
> > merge 2 and 3 together, you would do:
> > 
> > quilt pop
> > quilt delete 3
> > quilt fold < patches/3
> > # Verify that it worked OK, quilt diff should show 2 and 3 merged
> > rm patches/3
> 
> Using quilt from cvs, you could save one operation using:
> 
> quilt pop
> quilt fold < patches/3
> quilt delete -r 3

not thinking much about the internal and this is just an idea; we
already have fork command, why not have merge?

    quilt merge 2 3

would be much simpler, no?
--
         yashi