Re: How to cope with patches sanely

2008-02-29 Thread Florian Weimer
* Manoj Srivastava: > But there is no such linearization, not in the way that quilt et > al do it. The state of such integration is not maintained in the > feature branches; it is in the history of the integration branch. As > each feature branch was created or developed, if there wer

Re: How to cope with patches sanely

2008-02-29 Thread Florian Weimer
* Manoj Srivastava: > Now, a lot of what I need is already present. > 1) the orig.tar.gz represents the upstream branch, exactly. > 2) the diff.gz + orig.tar.gz represents the integration branch, > exactly. > > So the missing thing is the topic branches. > 3) I propose ./de

Re: How to cope with patches sanely

2008-03-01 Thread Florian Weimer
* martin f. krafft: > also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.02.29.2153 +0100]: >> 3) I propose ./debian/branches/{TopicA,TopicB,TopicC}.diff.gz >> files. Each diff, applied to the orig.tar.gz , shall recreate for >> the interested user the corresponding branch in my de

Re: How to cope with patches sanely

2008-03-01 Thread Florian Weimer
* martin f. krafft: > also sprach Florian Weimer <[EMAIL PROTECTED]> [2008.03.01.1334 +0100]: >> The nice thing about Manoj's proposal that we (as in "the security >> team", for instance) need not care if the Debian maintainer thinks that >> upstream nee