How to cope with patches sanely

martin f krafft madduck at debian.org
Mon Feb 25 08:35:13 UTC 2008


also sprach Manoj Srivastava <srivasta at debian.org> [2008.02.25.0828 +0100]:
>         I am not opposed to it. If you can somehow magically create a
>  tool that can linearize the feature branches, more power to you. I
>  personally find the prospect highly unlikely; and I would like to see
>  some code, please, before I grant that such a thing is possible.

The tool I envision would simply surf through the history of the
integration branch and identify merge commits. Each merge would
become a patch in the quilt series.

>         Sure. You can't integrate two features that fundamentally
>  conflict with each other. No amount of smoke and mirrors can obscure
>  that fundamental obstacle. This is independent of the tool set you
>  use. 

Except that quilt provides the necessary glue to handle it, while
feature branches don't.

-- 
 .''`.   martin f. krafft <madduck at debian.org>
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems
 
echo '[dO%O+38%O+PO/d0<0]Fi22os0CC4BA64E418CE7l0xAP' | dc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20080225/dae6e18a/attachment.pgp 


More information about the vcs-pkg-discuss mailing list