[Quilt-dev] address@hidden: Bug#298788: Desirable new feature: quilt merge]

[Martin Quinson]

Hello,

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 ;)

Thanks for your time, Mt.

PS: as usual, it'd be cool if you could keep both the list and the bug in CC.

----- Forwarded message from Peter Chubb <address@hidden> -----

Subject: Bug#298788: Desirable new feature: quilt merge
X-Debian-PR-Package: quilt
From: Peter Chubb <address@hidden>
To: address@hidden
Date: Thu, 10 Mar 2005 09:50:48 +1100
X-Mailer: VM 7.17 under 21.4 (patch 17) "Jumbo Shrimp" XEmacs Lucid


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 an existing patch.  Something like

   f=`quilt files`
   t=`quilt top`
   quilt pop
   for i in $f
   do
        quilt add $i
   done
   cat patches/$t | quilt fold
   ed patches/series <<-!
   /^$t\>/d
   w
   q
   !

is the nearest I've come to what I want...  the tricky bit is in the
part of the patch before the patch proper.  I'd just want to
concatenate them, and let the user edit the patch file to fix it up
afterwards. 

--
Dr Peter Chubb     http://www.gelato.unsw.edu.au  address@hidden
You are lost in a maze of BitKeeper repositories,   all slightly different.




----- End forwarded message -----

signature.asc
Description: Digital signature