Re: git-svn: both merged commits and original commits are showing up in branches after migration

From: Bradley Wagner <bradley.wagner@hannonhill.com>
Date: Jul 9, 2010, 03:33 UTC
Message-ID: <AANLkTilm-BGNsAmb2OwP7qsHl3GJmTCxn_2uGM-GJGGd@mail.gmail.com>
In-Reply-To: <AANLkTikwyFwO2G1E6rozSxrI4g51wyA8CFV5jl30qRo-@mail.gmail.com>

Note: I could understand how the log could contain commits to the
trunk from *before* the branch was made, but not commits to the trunk
after the branch was made that were eventually merged into the branch
in a separate commit.

On Thu, Jul 8, 2010 at 10:58 PM, Bradley Wagner <bradley.wagner@hannonhill.com> wrote:

Show 58 quoted lines

> 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. Any idea why the
> Git branch has both (see below)? I did notice that the merged commits
> seem to have extra metadata in the "Merge" property.
>
> Results of "git log /path/to/6.7":
>
> commit 6e18557b8f7e7173d26df7dd1857362c27eb3ab1
> Merge: e36cfba c8a400c
> Author: <author>
> Date:   Fri Jun 25 21:00:19 2010 +0000
>
>    PROJ-6648 (Merged from Trunk): Updated the API version in build file
>
>    git-svn-id:
> file:///Users/Developers/git_transition/svn_repo/6.7@14254
> f4356f54-06d4-464e-91d3-36485834cb4b
>
> commit c8a400c3ef8ac113dd325382bedd073bfedc3dd1
> Author: <author>
> Date:   Fri Jun 25 20:39:33 2010 +0000
>
>    PROJ-6648: Updated the API version in build file
>
>    git-svn-id:
> file:///Users/Developers/git_transition/svn_repo/trunk@14253
> f4356f54-06d4-464e-91d3-36485834cb4b
>
>
> commit 9b968ba82f6f850919c41702dc024703e5721b7e
> Merge: <author2>
> Author: Mike Strauch <mike.strauch@hannonhill.com>
> Date:   Fri Jun 25 14:45:30 2010 +0000
>
>    PROJ-6819: (Merged from Trunk) Reverted changes from last commit
> where initialize and teardown were called on each sftpshuttle
> invocation.  Now using a strategy where
>
>    git-svn-id:
> file:///Users/Developers/git_transition/svn_repo/6.7@14251
> f4356f54-06d4-464e-91d3-36485834cb4b
>
>
> commit c628db12ef8136cdf22749058e8d8682d0021b8b
> Author: <author2>
> Date:   Thu Jun 24 20:10:53 2010 +0000
>
>    PROJ-6819: Reverted changes from last commit where initialize and
> teardown were called on each sftpshuttle invocation.  Now using a
> strategy where the retries counter
>
>    git-svn-id:
> file:///Users/Developers/git_transition/svn_repo/trunk@14240
> f4356f54-06d4-464e-91d3-36485834cb4b
>