Re: How to cope with patches sanely

2008-02-25 Thread martin f krafft
also sprach Manoj Srivastava [EMAIL PROTECTED] [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,

Re: How to cope with patches sanely

2008-02-25 Thread Cyril Brulebois
On 25/02/2008, Pierre Habouzit wrote: I'm planning to write a textual version of what I demonstrated at FOSDEM, with some more ideas that I had talking with Julien Cristau on the grass after. Please, pretty please, include graphics. Be it ASCII art-like drawings, or gitk screenshots, with

Re: How to cope with patches sanely

2008-02-24 Thread Manoj Srivastava
On Sat, 23 Feb 2008 16:58:01 +0100, Pierre Habouzit [EMAIL PROTECTED] said: On Sat, Feb 23, 2008 at 03:08:23PM +, Manoj Srivastava wrote: On Sat, 23 Feb 2008 08:46:03 -0500, David Nusinow [EMAIL PROTECTED] said: On Fri, Feb 22, 2008 at 09:37:24AM -0600, Manoj Srivastava wrote: On

Re: How to cope with patches sanely

2008-02-24 Thread Manoj Srivastava
On Sat, 23 Feb 2008 11:20:55 -0500, David Nusinow [EMAIL PROTECTED] said: On Sat, Feb 23, 2008 at 09:08:23AM -0600, Manoj Srivastava wrote: Now, you are trying to make me go towards a mechanism I think is inferior (a liner, dependent, and in my opinion, opaque, and somewhat shaky linear

Re: How to cope with patches sanely

2008-02-24 Thread Ben Finney
Manoj Srivastava [EMAIL PROTECTED] writes: David Nusinow [EMAIL PROTECTED] said: No matter what you want to say about your feature branches, you *must* apply them in a linear fashion to your final source tree that you ship in the package. This is no way around it. But there is

Re: How to cope with patches sanely

2008-02-24 Thread Manoj Srivastava
Hi, I think one of the differences that patch series mechanism has wrt to new development, either in a feature or upstream, is that it requires updates to the integration work doe every single upload. It also requires a strict ordering between each feature, making it harder to compile

Re: How to cope with patches sanely

2008-02-24 Thread Manoj Srivastava
On Sun, 24 Feb 2008 11:04:21 +0100, martin f krafft [EMAIL PROTECTED] said: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.02.22.1627 +0100]: I am not sure you have understood feature branches. They are independent, no matter what the overlap. Each feature branch tracks one feature

Re: How to cope with patches sanely

2008-02-24 Thread Raphael Hertzog
Hi, On Sun, 24 Feb 2008, Manoj Srivastava wrote: I like the reduced work for each upload, and since it satisfies the use cases of being able to present upstream with a pure feature changeset; It doesn't satisfy it completely. You can always generate a patch for a pure feature

Re: How to cope with patches sanely

2008-02-23 Thread David Nusinow
On Sat, Feb 23, 2008 at 09:08:23AM -0600, Manoj Srivastava wrote: Now, you are trying to make me go towards a mechanism I think is inferior (a liner, dependent, and in my opinion, opaque, and somewhat shaky linear patch series) as opposed to pure, independent feature branches, for

Re: How to cope with patches sanely

2008-02-22 Thread Manoj Srivastava
On Thu, 21 Feb 2008 16:20:49 +0100, martin f krafft [EMAIL PROTECTED] said: also sprach Manoj Srivastava [EMAIL PROTECTED] [2008.02.20.1722 +0100]: I have to take care of it manually once. That is the first time I setup the integration branch that merges in changes from the overlapping