All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Bryan Jacobs <bjacobs@woti.com>
Cc: Eric Wong <normalperson@yhbt.net>, git@vger.kernel.org
Subject: Re: [spf:guess,iffy] Re: [spf:guess] Re: [PATCH] Teach dcommit --mergeinfo to handle multiple lines
Date: Wed, 31 Aug 2011 15:15:09 -0700	[thread overview]
Message-ID: <4E5EB26D.8030004@vilain.net> (raw)
In-Reply-To: <20110831165109.0ca6373f@robyn.woti.com>

On 8/31/11 1:51 PM, Bryan Jacobs wrote:
> ...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

  reply	other threads:[~2011-08-31 22:15 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   ` [spf:guess] " Sam Vilain
2011-08-31 20:51     ` Bryan Jacobs
2011-08-31 22:15       ` Sam Vilain [this message]
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=4E5EB26D.8030004@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.