Re: git-svn: Finding the svn-URL of the current branch in git

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 17, 2007, 08:45 UTC
Message-ID: <7vir7eh7mc.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20070816082110.GB16849@muzzle>

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?