public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Eric Wong <normalperson@yhbt•net>
To: git@vger•kernel.org
Subject: git-svn: does anybody care for sub-optimal merge tracking?
Date: Sun, 14 Jan 2007 22:56:35 -0800	[thread overview]
Message-ID: <20070115065635.GA939@localdomain> (raw)

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

                 reply	other threads:[~2007-01-15 17:54 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20070115065635.GA939@localdomain \
    --to=normalperson@yhbt$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox