Re: [PATCH] git-svn: teach git-svn to populate svn:mergeinfo

From: Eric Wong <normalperson@yhbt.net>
Date: Sep 6, 2011, 20:57 UTC
Message-ID: <20110906205750.GB12574@dcvr.yhbt.net>
In-Reply-To: <20110902140702.066a4668@robyn.woti.com>

Bryan Jacobs <bjacobs@woti.com> wrote:

> +sub split_merge_info_range {
> +	my ($range) = @_;
> +	if ($range =~ /(\d+)-(\d+)/o) {

No need for "/o" in regexps unless you have a (constant) variable expansion in there.

Show 7 quoted lines

> +sub merge_commit_fail {
> +	my ($gs, $linear_refs, $d) = @_;
> +	#while (1) {
> +	#	my $cs = shift @$linear_refs or last;
> +	#	command_noisy(qw/cherry-pick/, $cs);
> +	#}
> +	#command_noisy(qw/cherry-pick -m/, '1', $d);

Huh?  If there's commented-out code, it must be explained or removed.

> +	fatal "Aborted after failed dcommit of merge revision";
> +}

Show 5 quoted lines

> +++ b/t/t9160-git-svn-mergeinfo-push.sh
> @@ -0,0 +1,97 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2007, 2009 Sam Vilain

That should be: "Copyright (c) 2011 Brian Jacobs", correct?

> +test_expect_success 'check svn:mergeinfo' '
> +	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
> +	echo "$mergeinfo"

No need to echo unless you're debugging a test, right?

-- 
Eric Wong