All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sam Vilain <sam@vilain.net>
To: Bryan Jacobs <bjacobs@woti.com>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH] git-svn: teach git-svn to populate svn:mergeinfo
Date: Fri, 02 Sep 2011 14:30:15 -0700	[thread overview]
Message-ID: <4E614AE7.7090706@vilain.net> (raw)
In-Reply-To: <20110902154206.331b80e9@robyn.woti.com>

On 9/2/11 12:42 PM, Bryan Jacobs wrote:
> On Fri, 02 Sep 2011 12:01:09 -0700
> Sam Vilain<sam@vilain.net>  wrote:
>
>> That's one way to do it; in fact, if the trees match you don't need
>> to do anything complicated like cherry-pick.
>>
>> ie, say you're committing
>>
>>      r1---A---B---C---D
>>
>> and it blows up at
>>
>>      r1--r2--r3--C---D
>>
>> So long as the tree from the fetched r3 == the tree from B, then you
>> can just go ahead and write out new commits for C and D without doing
>> any merging (ie cherry-pick or rebase).  You could also put merge
>> commits back the way they were, too.
> When you say "write out new commits" you mean create a commit object
> with the same contents, but a different parent? Does git-svn do this
> somewhere already?

I guess it doesn't, but if it did it would certainly make this easier.  
I'm not sure why it would need to modify the WC at all.  Eric, is this 
just historical or is there a better reason for that?

Sam

  reply	other threads:[~2011-09-02 21:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-02 18:07 [PATCH] git-svn: teach git-svn to populate svn:mergeinfo Bryan Jacobs
2011-09-02 18:40 ` [spf:guess,iffy] " Sam Vilain
2011-09-02 18:49   ` Bryan Jacobs
2011-09-02 19:01     ` [spf:guess,iffy] " Sam Vilain
2011-09-02 19:42       ` Bryan Jacobs
2011-09-02 21:30         ` Sam Vilain [this message]
2011-09-03  8:49           ` Eric Wong
2011-09-06 14:00             ` Bryan Jacobs
2011-09-06 20:45               ` Eric Wong
2011-09-06 20:57 ` Eric Wong
2011-09-07 14:14   ` Bryan Jacobs

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=4E614AE7.7090706@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.