Re: [PATCH] git-merge: add option --no-ff

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 17, 2007, 15:05 UTC
Message-ID: <Pine.LNX.4.64.0709171603090.28586@racer.site>
In-Reply-To: <8c5c35580709170712v2f5df7b1w8fa0377b69f24988@mail.gmail.com>

Hi,

On Mon, 17 Sep 2007, Lars Hjemli wrote:

Show 18 quoted lines

> On 9/17/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > But then, I do not use svn branches here, and that might be the problem?
> 
> Probably. The case I'm trying to solve is:
>   -git-svn branch A is merged into git-svn branch B
>   -A is a fast-forward of B
> 
> This might look unrealistic, but it happened to me today when I wanted
> to merge a feature-branch into a relase-branch. The release-branch had
> previously been merged into the feature-branch (to get a few
> bugfixes), but the release-branch had not changed since this merge. So
> when merging the feature-branch into the release-branch it just
> fast-forwarded, leaving me with an 'un-dcomittable' release-branch. I
> obviously could have done the merge in subversion (haha!), but doing
> it in git preserves the correct history.
> 
> Btw: I have redone the merge with --no-ff, and dcommit then worked
> like a charm ;-)

Yep, I can see that now.

But maybe there is a better method to detect the latest svn id, by not only looking up the svn ids, but making sure that they come from the current branch?

(I'm happily unaware of git-svn's internals, so that might not be feasible... But I think that it might be worth fixing that for the git-svn idiot like me, since I would never guess that I have to specify --no-ff when working on branches that come from git-svn...)

Ciao, Dscho