From: Junio C Hamano <gitster@pobox.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: Matthias Kleine <matthias_kleine@gmx.de>, git@vger.kernel.org
Subject: Re: git-svn: Finding the svn-URL of the current branch in git
Date: Fri, 17 Aug 2007 01:45:31 -0700 [thread overview]
Message-ID: <7vir7eh7mc.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070816082110.GB16849@muzzle> (Eric Wong's message of "Thu, 16 Aug 2007 01:21:10 -0700")
Eric Wong <normalperson@yhbt.net> writes:
> Junio:
> Would you object to having git-merge spew a big fat warning
> and/or outright refuse to let git-merge run on git-svn repositories?
Actually I do. A major, if not primary, selling point of
git-svn has been that svn cannot do merges but if you import to
git you can, and I've had an impression that Sam's git-svn intro
alludes to this capability as well.
If I understand you correctly, your position is that the svn
side has the authoritative history when using git-svn, and we
should refuse to do anything on the git side that the resulting
history in svn cannot represent. I know and respect that you
have thought about the issues involved long enough before that
declaration of defeat, but at the same time, I would really hope
that we can come up with a workable compromise to allow merge
tracking on the git side.
It probably does not even have to interoperate with people who
do their own merge tracking using svk. Perhaps something as
simple and ugly as recording the parent commit object names on
the git side as a trailer to the commit log message we push back
to svn would allow people who interact with the same svn
repository from their own git-svn managed git repository to
interoperate with each other?
next prev parent reply other threads:[~2007-08-17 8:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-07 18:29 git-svn: Finding the svn-URL of the current branch in git Matthias Kleine
2007-08-07 20:55 ` Peter Baumann
2007-08-08 8:54 ` Matthias Kleine
2007-08-08 9:13 ` Junio C Hamano
2007-08-08 18:51 ` Matthias Kleine
2007-08-08 19:25 ` Peter Baumann
2007-08-08 20:57 ` Peter Baumann
2007-08-16 8:21 ` Eric Wong
2007-08-16 12:16 ` Peter Baumann
2007-08-17 7:55 ` Eric Wong
2007-08-17 8:45 ` Junio C Hamano [this message]
2007-08-18 9:09 ` Eric Wong
2007-08-18 9:57 ` David Kastrup
2007-08-18 10:04 ` Junio C Hamano
2007-08-18 21:18 ` Karl Hasselström
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vir7eh7mc.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matthias_kleine@gmx.de \
--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.
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 NNTP newsgroup(s).