From: Sam Vilain <sam@vilain.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: Bryan Jacobs <bjacobs@woti.com>, git@vger.kernel.org
Subject: Re: [spf:guess] Re: [PATCH] Teach dcommit --mergeinfo to handle multiple lines
Date: Wed, 31 Aug 2011 13:43:39 -0700 [thread overview]
Message-ID: <4E5E9CFB.4060600@vilain.net> (raw)
In-Reply-To: <20110831202131.GA27307@dcvr.yhbt.net>
On 8/31/11 1:21 PM, Eric Wong wrote:
>> --- a/Documentation/git-svn.txt
>> +++ b/Documentation/git-svn.txt
>> @@ -211,8 +211,9 @@ discouraged.
>> Add the given merge information during the dcommit
>> (e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can
>> 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.
>> + version 1.5 can make use of it. To specify merge information from multiple
>> + branches, use a single space character between the branches
>> + (`--mergeinfo="/branches/foo:1-10 /branches/bar:3,5-6,8"`)
This interface seems regrettably stupid. Like, do I need to consider
the existing revisions that are already listed in the property? Is it
really impossible to derive the changes that were merged and generate
the list automatically?
But so long as it makes something previously impossible possible, it is
a good change - my feeling is that it should be called something like
--mergeinfo-raw or --mergeinfo-set to leave room for a possible
--mergeinfo-add which knows how the lists work and adds them (which is
what I'd expect a plain --mergeinfo switch to do).
Sam
next prev parent reply other threads:[~2011-08-31 20:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-31 16:48 [PATCH] Teach dcommit --mergeinfo to handle multiple lines Bryan Jacobs
2011-08-31 20:21 ` Eric Wong
2011-08-31 20:43 ` Sam Vilain [this message]
2011-08-31 20:51 ` [spf:guess] " Bryan Jacobs
2011-08-31 22:15 ` [spf:guess,iffy] " Sam Vilain
2011-09-01 1:37 ` Eric Wong
2011-09-01 4:40 ` [spf:guess] " Sam Vilain
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=4E5E9CFB.4060600@vilain.net \
--to=sam@vilain.net \
--cc=bjacobs@woti.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).