Re: git-svn and mergeinfo

From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Aug 31, 2011, 13:59 UTC
Message-ID: <CAGdFq_h+KjWQUwwLdaqA-0j0p1zQznZkNNEVgfS46_o-Zfr3oQ@mail.gmail.com>
In-Reply-To: <20110829132052.0ad7a088@robyn.woti.com>

Heya,

On Mon, Aug 29, 2011 at 19:20, Bryan Jacobs <bjacobs@woti.com> wrote:

> Apologies if this is not the right forum for bug reports. I was unable
> to find a Bugzilla/Redmine/Flyspray instance for issue maintenance, nor
> some "proper procedure" on the git web page.

This is indeed the correct way of reporting bugs :).

Show 18 quoted lines

> However, to make this work with git 1.7.6, I needed to make *one* change
> to the git internals: --merge-info does not allow setting mergeinfo for
> more than one branch. Because it's a complete overwrite operation
> instead of an update, this is a serious issue preventing its use for
> nontrivial branches.
>
> Might I suggest adding a block like the following around line 552 of
> git-svn?
>
>    if (defined($_merge_info))
>    {
>        $_merge_info =~ tr{ }{\n};
>    }
>
> This will replace any spaces in --merge-info with newlines, allowing
> specification of an svn:mergeinfo that contains merges from more than a
> singe branch. So the user can provide "--merge-info
> '/branch1:r2323-3849,r8888 /branch2:r9999'" and the like.

Why not submit this as a proper patch [0] to the list, I reckon Eric (cc-ed, the maintainer of git-svn) wouldn't mind including it.

> Thank you for your consideration. I am not subscribed to this list, so
> if there are any replies, please copy my address.

That's the policy on this list anyway :).

[0] http://git.kernel.org/?p=git/git.git;a=blob;f=Documentation/SubmittingPatches;hb=HEAD

-- 
Cheers,

Sverre Rabbelier