From: "Lars Hjemli" <hjemli@gmail.com>
To: "Peter Baumann" <waste.manager@gmx.de>
Cc: "Eric Wong" <normalperson@yhbt.net>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] git-svn: remove --first-parent, add --upstream
Date: Fri, 7 Sep 2007 12:13:23 +0200 [thread overview]
Message-ID: <8c5c35580709070313l4b815ddbg70be8fb0aef4eefd@mail.gmail.com> (raw)
In-Reply-To: <20070907084352.GD4538@xp.machine.xx>
On 9/7/07, Peter Baumann <waste.manager@gmx.de> wrote:
> lets reset 'trunk' to its state before the merge and
> 'branch1' to the merge commit, before fixing the bug in 'branch1'.
>
> a-b-c-d-e trunk
> \ \
> \ -x-y m branch1
Yeah, this would certainly not be handled correctly by dcommit using
--first-parent (but it could be handled by (a correct implementation
of) --upstream).
Thanks for the example, I had a feeling something like this could
occur. So I guess I'll have another go at --upstream this weekend.
[btw: could you please stop messing with 'Mail-Followup-To:'? When
replying to your mail, I don't want everyone _except_ you in the 'To:'
header...]
--
larsh
next prev parent reply other threads:[~2007-09-07 10:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-05 9:35 [RFC/PATCH] git-svn: add support for --first-parent Lars Hjemli
2007-09-05 10:19 ` Eric Wong
2007-09-06 7:18 ` Lars Hjemli
2007-09-06 7:51 ` Eric Wong
2007-09-06 8:05 ` David Kastrup
2007-09-06 8:34 ` Lars Hjemli
2007-09-06 16:37 ` [PATCH] git-svn: remove --first-parent, add --upstream Lars Hjemli
2007-09-06 17:49 ` Steven Grimm
2007-09-06 21:01 ` Eric Wong
2007-09-06 21:35 ` Eric Wong
2007-09-06 22:14 ` Lars Hjemli
2007-09-06 23:55 ` Peter Baumann
2007-09-07 0:23 ` Lars Hjemli
2007-09-07 8:43 ` Peter Baumann
2007-09-07 10:13 ` Lars Hjemli [this message]
2007-09-07 11:51 ` Peter Baumann
2007-09-07 12:08 ` Configure mutt to be used in git and lkml mailing lists (was: Re: [PATCH] git-svn: remove --first-parent, add --upstream) Fernando J. Pereda
2007-09-07 18:37 ` [PATCH] git-svn: remove --first-parent, add --upstream Eric Wong
2007-09-15 14:08 ` Lars Hjemli
2007-09-15 14:37 ` Peter Baumann
2007-09-15 15:24 ` Lars Hjemli
2007-09-15 15:49 ` Peter Baumann
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=8c5c35580709070313l4b815ddbg70be8fb0aef4eefd@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
--cc=waste.manager@gmx.de \
/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).