From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 04 Apr 2013 01:31:31 GMT
Subject: Re: [PATCH] git-svn: avoid self-referencing mergeinfo
Message-ID: <20130404013131.GA18539@dcvr.yhbt.net>
In-Reply-To: <20130330220642.GA14641@gmail.com>

Michael Contreras <michael@inetric.com> wrote:
> When svn.pushmergeinfo is set, the target branch is included in the
> mergeinfo if it was previously merged into one of the source branches.
> SVN does not do this.
> 
> Remove merge target branch path from resulting mergeinfo when
> svn.pushmergeinfo is set to better match the behavior of SVN. Update the
> svn-mergeinfo-push test.
> 
> Signed-off-by: Michael Contreras <michael@inetric.com>
> Reported-by: Avishay Lavie <avishay.lavie@gmail.com>

Acked-by: Eric Wong <normalperson@yhbt.net>

80-column wrapped version pushed to git://bogomips.org/git-svn master
(commit e5ee78e1f0835410a37bfa38e1ff5e1a82f8c7b5)

Will ask Junio to pull unless Sam (our mergeinfo expert) gives a NACK
soon.