git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [spf:guess,iffy] Re: [spf:guess] Re: [PATCH] Teach dcommit --mergeinfo to handle multiple lines

From
Sam Vilain <sam@vilain.net>
Date
Aug 31, 2011, 22:15 UTC
Message-ID
<4E5EB26D.8030004@vilain.net>
In-Reply-To
<20110831165109.0ca6373f@robyn.woti.com>
On 8/31/11 1:51 PM, Bryan Jacobs wrote:
Show 21 quoted lines
> ...I didn't create the original --mergeinfo interface. I was very 
> surprised when I first discovered it clobbered instead of integrating 
> - it's easy to nuke your SVN repo's ability to merge with one careless 
> use of this option. See below.
>> 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).
> I completely agree. I think there should at least be a
> --mergeinfo-update which fetches the current revision, merges that with
> the provided set using the branch paths as keys (and compacts using
> svn:mergeinfo rules), and sets the property to the final result.
>
> I actually do this currently with external scripts, which is why I
> wanted to make --mergeinfo capable of delivering my final payload. It
> would make my life easier if all the logic were part of git-svn instead.
>
> That said, this change is really small. That change would be larger.
> So I submitted this first.
>

Ok, well I guess this is a useful intermediate feature then. Feel free to copy in any further changes you may come up with in this area to me, if you decide to do that.

Cheers, Sam

Previous: Bryan JacobsNext: Eric Wong
Message 5 of 7 in “Teach dcommit --mergeinfo to handle multiple lines”
  1. Teach dcommit --mergeinfo to handle multiple linesBryan Jacobs, Aug 31, 2011
  2. Eric WongAug 31, 2011
  3. Sam VilainAug 31, 2011
  4. Bryan JacobsAug 31, 2011
  5. Sam VilainAug 31, 2011
  6. Eric WongSep 1, 2011
  7. Sam VilainSep 1, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.