Re: [spf:guess] Re: [PATCH] Teach dcommit --mergeinfo to handle multiple lines
- From
Sam Vilain <sam@vilain.net>
- Date
- Aug 31, 2011, 20:43 UTC
- Message-ID
- <4E5E9CFB.4060600@vilain.net>
- In-Reply-To
- <20110831202131.GA27307@dcvr.yhbt.net>
On 8/31/11 1:21 PM, Eric Wong wrote:
Show 11 quoted lines
>> --- 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