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

git-svn: does anybody care for sub-optimal merge tracking?

From
EWEric Wong <normalperson@yhbt.net>
Date
Jan 15, 2007, 06:56 UTC
Message-ID
<20070115065635.GA939@localdomain>

First off, parental information on the creation of new tags and branches will stay, meaning --follow-parent will remain in git-svn; and will probably even become the default for fetching.

However... there are some experimental features in git-svn that I'm considering dropping:

* tree matching: -b/--branch <refname> and -B/--branch-all-refs[1]
* the graft-branches command

Tree matches are usually done at fetch time, and will add parents to an imported commit if the tree matches the one made in a commit. I originated this feature myself, but have not used it often.

Tree matching likely has problems with a dcommit-based workflow (I haven't heard any complaints, either because nobody is using it or they're still using set-tree (formerly 'commit').

Tree matching will almost certainly go away unless somebody raises some very good objections.

graft-branches attempts to do merge-tracking via regexes on log messages, analyzing parenting information in logs, and also via tree matching (like -b/-B). git-svnimport does somewhat the same things (minus tree matching), but at import time (not after-the-fact with grafts).

Despite spending a reasonable amount of time creating graft-branches, I have hardly ever used it on real projects; and the times I did use it I didn't think it was very useful. The regex matching on log messages and parenting information in logs should not be harmful to a dcommit-based workflow.

[1] - apologies for not documenting -B/--branch-all-refs in
      the manpage, it's basically shorthand for:
      `git-rev-parse --symbolic --all | xargs -n1 echo -b`
-- 
Eric Wong
Message 1 of 1 in “git-svn: does anybody care for sub-optimal merge tracking?”
  1. Eric WongJan 15, 2007

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.