git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 12, 2010, 18:24 UTC
Message-ID
<20100712182421.GA8644@dert.cs.uchicago.edu>
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:
Show 5 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.

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

Previous: Bradley WagnerNext: Bradley Wagner
Message 4 of 5 in “git-svn: both merged commits and original commits are showing up in branches after migration”
  1. Bradley WagnerJul 9, 2010
  2. Bradley WagnerJul 9, 2010
  3. Bradley WagnerJul 12, 2010
  4. Jonathan NiederJul 12, 2010
  5. Bradley WagnerJul 12, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.