From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Fri, 26 Nov 2010 19:16:46 GMT
Subject: Re: [PATCH/RFC 00/20] Refactor rebase
Message-ID: <alpine.DEB.1.10.1011261954350.17721@debian>
In-Reply-To: <AANLkTikyQTA3b8+subR2FTL9zFBt_dGqNxjsjP+fwE-n@mail.gmail.com>

On Fri, 26 Nov 2010, Sverre Rabbelier wrote:

> Heya,
> 
> On Thu, Nov 25, 2010 at 21:23, Martin von Zweigbergk
> <martin.von.zweigbergk@gmail.com> wrote:
> > I forgot to say that the patches should be applied on pu.
> 
> This is undesirable. In general you should base your patches on
> master, unless they depend on a multiple topics in next, in which case
> it's acceptable to base them on next (or directly on that particular
> topic, if there's only one).

They touch the same code as 729ec9e (rebase --abort: do not update
branch ref), 7baf9c4 (rebase: support --verify) and 92c62a3 (Porcelain
scripts: Rewrite cryptic "needs update" error message). However, it is
only 7baf9c4 that would have to be more or less redone if I did not
base the patch set on it. Do I understand correctly that I should
therefore have based them directly off of 7baf9c4?

I suppose it is not worth resending this time. Tell me if you think
otherwise.

/Martin