From: "Lars Hjemli" <hjemli@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Eric Wong" <normalperson@yhbt.net>,
"Andreas Ericsson" <ae@op5.se>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Chris Shoemaker" <c.shoemaker@cox.net>,
git@vger.kernel.org
Subject: Re: [PATCH] git-merge: add option --no-ff
Date: Tue, 18 Sep 2007 10:02:44 +0200 [thread overview]
Message-ID: <8c5c35580709180102l10e89094tab801cd5742c6415@mail.gmail.com> (raw)
In-Reply-To: <7v4phsxy55.fsf@gitster.siamese.dyndns.org>
On 9/18/07, Junio C Hamano <gitster@pobox.com> wrote:
> "Lars Hjemli" <hjemli@gmail.com> writes:
>
> > On 9/18/07, Eric Wong <normalperson@yhbt.net> wrote:
> >> Would automatically enabling --no-ff when it detects merging of two (or
> >> more) SVN branches be a good thing?
> >
> > I'd say 'git-svn merge' as a wrapper for 'git merge --no-ff' would be cleaner.
>
> That unfortunately does not solve the problem.
>
The problem we're trying to solve is to somehow avoid fast-forward
merges between git-svn branches, right?
I don't think it's a big issue in itself. If a fast-forward occurs,
what will happen is basically that git-svn will guess the wrong
upstream branch and then proceed to do nothing [1]. The user can
always recover from this state with 'git-reset' and 'git-merge
--no-ff'. So I think the result of a fast-forward merge between
git-svn branches is annoying, but not fatal [2].
But a closely related issue is that git-svn shouldn't dcommit to the
wrong upstream (even in the case of a fast-forward merge). We need a
way to explicitly show the link between the local and remote svn
branch (something like .git/config perhaps).
--
larsh
[1] If the merged-in branch had local commits they will be 'dcommited'
to the correct upstream of the merged-in branch, which isn't to bad
[2] if git-svn could be fixed to handle even the ff case, someone
could actually prefer to get the 'cherry-picked' history in
subversion. I don't, hence my --no-ff patch, but I'm not at all
certain this should be _forced_ on git-svn branches.
next prev parent reply other threads:[~2007-09-18 8:02 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 12:17 [PATCH] git-merge: add option --no-ff Lars Hjemli
2007-09-17 12:39 ` Andreas Ericsson
2007-09-17 13:16 ` Lars Hjemli
2007-09-17 13:23 ` Johannes Schindelin
2007-09-17 13:37 ` Chris Shoemaker
2007-09-17 13:40 ` Lars Hjemli
2007-09-17 13:52 ` Johannes Schindelin
2007-09-17 13:38 ` Lars Hjemli
2007-09-17 13:57 ` Johannes Schindelin
2007-09-17 14:12 ` Lars Hjemli
2007-09-17 15:05 ` Johannes Schindelin
2007-09-17 15:17 ` Lars Hjemli
2007-09-17 16:23 ` Lars Hjemli
2007-09-18 0:50 ` Eric Wong
2007-09-18 1:09 ` Junio C Hamano
2007-09-18 1:39 ` Eric Wong
2007-09-18 6:12 ` Lars Hjemli
2007-09-18 6:23 ` Eric Wong
2007-09-18 6:53 ` Junio C Hamano
2007-09-18 7:30 ` Sam Vilain
2007-09-18 9:12 ` Sam Vilain
2007-09-18 11:19 ` Lars Hjemli
2007-09-18 11:50 ` Sam Vilain
2007-09-18 12:03 ` Lars Hjemli
2007-09-18 13:22 ` Sam Vilain
2007-09-18 14:01 ` Lars Hjemli
2007-09-18 14:34 ` Sam Vilain
2007-09-18 12:29 ` Johannes Schindelin
2007-09-18 12:38 ` Lars Hjemli
2007-09-18 8:02 ` Lars Hjemli [this message]
2007-09-18 22:51 ` Peter Baumann
2007-09-19 7:09 ` Lars Hjemli
2007-09-17 16:07 ` Chris Shoemaker
2007-09-17 16:14 ` Lars Hjemli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c5c35580709180102l10e89094tab801cd5742c6415@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ae@op5.se \
--cc=c.shoemaker@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).