From: Jonathan Nieder <jrnieder@gmail.com>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: git-svn: both merged commits and original commits are showing up in branches after migration
Date: Mon, 12 Jul 2010 13:24:21 -0500 [thread overview]
Message-ID: <20100712182421.GA8644@dert.cs.uchicago.edu> (raw)
In-Reply-To: <AANLkTin3TYuC-y2U-o4NEgXH7N4M59vqWxXsa6J2Ae74@mail.gmail.com>
Hi Bradley,
Bradley Wagner wrote:
> On Thu, Jul 8, 2010 at 10:58 PM, Bradley Wagner wrote:
>> I've done a migration using "git-svn init" and "git-svn fetch". After
>> the migration, I did a "git log refs/remotes/svn/6.7" and found that
>> it listed both the commits that I merged into the 6.7 branch and the
>> original commits to the trunk/master even though the SVN history
>> obviously only has what was merged into that branch.
Yes, this is intentional. If you try ‘gitk --all’, you can see
the history of all branches, where they branched from, and so on.
As far as I know the svn:mergeinfo is not actually used until
a merge. Instead, git-svn uses subversion’s file copy tracking
information to follow history past a branch point; see the
find_parent_branch function in the git-svn script for details.
Hope that helps,
Jonathan
next prev parent reply other threads:[~2010-07-12 18:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-09 2:58 git-svn: both merged commits and original commits are showing up in branches after migration Bradley Wagner
2010-07-09 3:33 ` Bradley Wagner
2010-07-12 17:34 ` Bradley Wagner
2010-07-12 18:24 ` Jonathan Nieder [this message]
2010-07-12 18:31 ` Bradley Wagner
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=20100712182421.GA8644@dert.cs.uchicago.edu \
--to=jrnieder@gmail.com \
--cc=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).