Re: git-svn merge helper

From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Sep 30, 2007, 14:15 UTC
Message-ID: <1EF130A4-3CC7-4A42-9166-3539D9A38828@lrde.epita.fr>
In-Reply-To: <20070930110550.GA4557@atjola.homenet>

On Sep 30, 2007, at 1:05 PM, Björn Steinbrink wrote:

Show 13 quoted lines

> Hi,
>
> I recently discovered git-svn and absolutey love it. One thing that  
> I'm
> missing though, is an equivalent of "svn merge" for merging between  
> svn
> remotes, to support the SVN way of using "squashed" merges, where you
> just note the merge meta-data in the commit message. "git merge"  
> didn't
> work for me (and probably isn't expected to work) to merge between two
> svn branches, so I've resorted to cherry-picking the required commits
> one by one into a temporary branch and then squashing them together by
> doing a --squash merge with a second temporary branch (as in [1]).

I fail to see why you'd want to reproduce the broken behavior of svn merge. Anyways, git-svn is a great way to merge SVN branches, unfortunately it can't detect when merges happened on the SVN side. I think you can use it nevertheless by manually adding a graft at the last merge point, which would help you merging the right revisions without having to specify what needs to be merged (unless someone made another merge on the SVN side, in which case you need to update your graft).

Cheers,

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory