Bug#298788: Desirable new feature: quilt merge

2005-03-09 Thread Peter Chubb
Package: quilt Version: 0.39-1 Severity: wishlist Quilt currently has the ability to `fork' a patch, but no simple ability to fold two patches into one. I'd find it useful to be able to merge the top two patches into one. quilt fold doesn't do what I want, as it imports an external patch into a

Bug#298788: [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Martin Quinson
bb <[EMAIL PROTECTED]> ----- Subject: Bug#298788: Desirable new feature: quilt merge X-Debian-PR-Package: quilt From: Peter Chubb <[EMAIL PROTECTED]> To: [EMAIL PROTECTED] Date: Thu, 10 Mar 2005 09:50:48 +1100 X-Mailer: VM 7.17 under 21.4 (patch 17) "Jumbo Shrimp" XEmacs Lucid

Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Catalin Marinas
Martin Quinson <[EMAIL PROTECTED]> wrote: > also from the debian BTS. I dunno what to think about it. I never forked any > patch, so I've no idea about merging them afterward ;) Assuming that you only try to merge forked patches, a diff3 merge could be performed between the common ancestor of all

Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Catalin Marinas
Catalin Marinas <[EMAIL PROTECTED]> wrote: > Martin Quinson <[EMAIL PROTECTED]> wrote: >> also from the debian BTS. I dunno what to think about it. I never forked any >> patch, so I've no idea about merging them afterward ;) > > Assuming that you only try to merge forked patches, a diff3 merge > co

Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Andreas Gruenbacher
f you could keep both the list and the bug in CC. > > - Forwarded message from Peter Chubb <[EMAIL PROTECTED]> - > > Subject: Bug#298788: Desirable new feature: quilt merge > X-Debian-PR-Package: quilt > From: Peter Chubb <[EMAIL PROTECTED]> > To: [EMAIL PRO