From: Toby Allsopp <Toby.Allsopp@navman.co.nz>
To: Sam Vilain <sam@vilain.net>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH 2/2] git-svn: handle SVN merges from revisions past the tip of the branch
Date: Fri, 13 Nov 2009 14:03:19 +1300 [thread overview]
Message-ID: <87ws1v44o8.fsf@navakl084.mitacad.com> (raw)
In-Reply-To: <4AFCAC9C.9020305@vilain.net> (Sam Vilain's message of "Fri, 13 Nov 2009 13:47:24 +1300")
On Fri, Nov 13 2009, Sam Vilain wrote:
> Toby Allsopp wrote:
> > When recording the revisions that it has merged, SVN sets the top
> > revision to be the latest revision in the repository, which is not
> > necessarily a revision on the branch that is being merged from. When
> > it is not on the branch, git-svn fails to add the extra parent to
> > represent the merge because it relies on finding the commit on the
> > branch that corresponds to the top of the SVN merge range.
>
> I thought, "that sounds like he's repeating himself, wait a sec..."
Hmm, it makes perfect sense to me :-) Does the explanation in 1/2 make
more sense?
The first sentence describes what Subversion does, the second what
git-svn does in response.
> Thanks for contributing this. There might be other bugs too, especially
> when upstream has a more complicated merge hierarchy ... apparently svn
> tends to get it wrong, so checking for all commits might not work in
> that case.
Oh yes, SVN gets the merges wrong in an alarming number of cases, it's
really shocking. I only stay sane at work because I tell myself that
SVN is making the case for git for me :-)
> It would be nice if "dcommit" could make these commits, too...
Yes.
Toby.
prev parent reply other threads:[~2009-11-13 1:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-12 20:18 [PATCH 2/2] git-svn: handle SVN merges from revisions past the tip of the branch Toby Allsopp
2009-11-13 0:47 ` Sam Vilain
2009-11-13 1:03 ` Toby Allsopp [this message]
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=87ws1v44o8.fsf@navakl084.mitacad.com \
--to=toby.allsopp@navman.co.nz \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=sam@vilain.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