Re: [PATCH] git svn dcommit: avoid self-referential mergeinfo lines when svn.pushmergeinfo is configured

From: Bryan Jacobs <bjacobs@woti.com>
Date: Mar 15, 2012, 22:07 UTC
Message-ID: <20120315180703.7c9c0629@robyn.woti.com>
In-Reply-To: <20120315220242.GA9348@dcvr.yhbt.net>

On Thu, 15 Mar 2012 22:02:42 +0000 Eric Wong <normalperson@yhbt.net> wrote:

Show 14 quoted lines

> 
> This test breaks t9161-git-svn-mergeinfo-push.sh:
> 
>   not ok - 12 check reintegration mergeinfo
>   #
>   #               mergeinfo=$(svn_cmd propget svn:mergeinfo
> "$svnrepo"/branches/svnb4) #               test "$mergeinfo" =
> "/branches/svnb1:2-4,7-9,13-18 #       /branches/svnb2:3,8,16-17
>   #       /branches/svnb3:4,9
>   #       /branches/svnb4:5-6,10-12
>   #       /branches/svnb5:6,11"
> 
> Be sure tests run successfully before submitting patches (or ask
> for help fixing tests).

The test is demonstrating the behavior the patch fixes.

A merge is made to "svnb4", and then the test checks that the mergeinfo contains "svnb4:5-6,10-12". So really this test could be adapted to prove that the patch is functioning as intended :-).

Bryan Jacobs