public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt•net>
To: Bryan Jacobs <bjacobs@woti•com>
Cc: git@vger•kernel.org, Sam Vilain <sam@vilain•net>
Subject: Re: [PATCH v2] git-svn: teach git-svn to populate svn:mergeinfo
Date: Fri, 9 Sep 2011 15:21:59 -0700	[thread overview]
Message-ID: <20110909222159.GA6530@dcvr.yhbt.net> (raw)
In-Reply-To: <20110907133605.07ecad1b@robyn.woti.com>

Bryan Jacobs <bjacobs@woti•com> wrote:
> This is the second revision of a patch I posted earlier. I believe
> this patch is now suitable for inclusion.

Some comments inline, but I can clean them up myself and push out in a
bit.

> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -213,6 +213,14 @@ discouraged.
>  	store this information (as a property), and svn clients starting from
>  	version 1.5 can make use of it. 'git svn' currently does not use it
>  	and does not set it automatically.

I noticed this conflicts when applying due to the missing --mergeinfo=
documentation.  Did you intend to remove --mergeinfo entirely and
replace it with this?  I think some folks already depend on it (it's
been around since last year).

> +	if (not defined($push_merge_info)
> +			or $push_merge_info eq "false"
> +			or $push_merge_info eq "no"
> +			or $push_merge_info eq "never") {

I missed this the first time, but "||" and "!" are easier for
C programmers to understand and higher in precedence (ref: perlop manpage)

-- 
Eric Wong

  reply	other threads:[~2011-09-09 22:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-07 17:36 [PATCH v2] git-svn: teach git-svn to populate svn:mergeinfo Bryan Jacobs
2011-09-09 22:21 ` Eric Wong [this message]
2011-09-12 14:24   ` Bryan Jacobs
2011-09-13  8:18     ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110909222159.GA6530@dcvr.yhbt.net \
    --to=normalperson@yhbt$(echo .)net \
    --cc=bjacobs@woti$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sam@vilain$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox