Re: [Quilt-dev] how to merge patches?
At Sat, 3 Sep 2005 11:30:00 +0200, jerome lacoste wrote: On 9/3/05, Jean Delvare [EMAIL PROTECTED] 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 ___ Quilt-dev mailing list Quilt-dev@nongnu.org http://lists.nongnu.org/mailman/listinfo/quilt-dev
Re: [Quilt-dev] how to merge patches?
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 -- Jean Delvare ___ Quilt-dev mailing list Quilt-dev@nongnu.org http://lists.nongnu.org/mailman/listinfo/quilt-dev
Re: [Quilt-dev] how to merge patches?
On 9/3/05, Jean Delvare [EMAIL PROTECTED] 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 Right? I would even do a fork before the fold in order to be sure I don't mess with patch 2. J ___ Quilt-dev mailing list Quilt-dev@nongnu.org http://lists.nongnu.org/mailman/listinfo/quilt-dev
RE: [Quilt-dev] how to merge patches?
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: [EMAIL PROTECTED] [mailto:quilt-dev- [EMAIL PROTECTED] On Behalf Of Raj, Ashok Sent: Friday, September 02, 2005 2:45 PM To: quilt-dev@nongnu.org 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 Quilt-dev@nongnu.org http://lists.nongnu.org/mailman/listinfo/quilt-dev ___ Quilt-dev mailing list Quilt-dev@nongnu.org http://lists.nongnu.org/mailman/listinfo/quilt-dev
