From: Bryan Jacobs <bjacobs@woti.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: Eric Wong <normalperson@yhbt.net>, git@vger.kernel.org
Subject: Re: git-svn and mergeinfo
Date: Wed, 31 Aug 2011 12:55:57 -0400 [thread overview]
Message-ID: <20110831125557.56ccffe2@robyn.woti.com> (raw)
In-Reply-To: <CAGdFq_h+KjWQUwwLdaqA-0j0p1zQznZkNNEVgfS46_o-Zfr3oQ@mail.gmail.com>
On Wed, 31 Aug 2011 15:59:26 +0200
Sverre Rabbelier <srabbelier@gmail.com> wrote:
>
> Why not submit this as a proper patch [0] to the list, I reckon Eric
> (cc-ed, the maintainer of git-svn) wouldn't mind including it.
I have submitted a patch, following your conventions as best I could. I
forgot the CC line, sorry Eric!
There was an inaccurate line in the documentation concerning the
svn:mergeinfo property ("git-svn does not currently make use of this")
which I clobbered with my documentation change. I did not document the
whole of how "git svn fetch" deals with the property, but this should
probably be done at some point.
Side notes: It may also be productive to automatically set mergeinfo
when all parents of a merge commit have git-svn-info annotations, but I
have not done this (as I said earlier, I use scripts external to git
for this task). Finally, I am uncertain why the git-svn-info lines are
stored in commit bodies instead of as notes; a notes-based approach
would not involve commit hashes changing when they are pushed to an
upstream SVN server.
Thanks all,
Bryan Jacobs
next prev parent reply other threads:[~2011-08-31 16:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-29 17:20 git-svn and mergeinfo Bryan Jacobs
2011-08-29 19:26 ` git bug reporting Jeff King
2011-08-29 19:34 ` Bryan Jacobs
2011-08-29 20:44 ` Junio C Hamano
2011-08-31 14:03 ` Sverre Rabbelier
2011-08-31 13:59 ` git-svn and mergeinfo Sverre Rabbelier
2011-08-31 16:55 ` Bryan Jacobs [this message]
2011-08-31 17:01 ` Sverre Rabbelier
2011-09-01 8:59 ` Michael Haggerty
2011-09-01 14:43 ` Bryan Jacobs
2011-09-01 16:00 ` Junio C Hamano
2011-09-06 12:56 ` Carlos Martín Nieto
2011-09-06 13:52 ` Bryan Jacobs
2011-09-06 14:28 ` Carlos Martín Nieto
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=20110831125557.56ccffe2@robyn.woti.com \
--to=bjacobs@woti.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=srabbelier@gmail.com \
/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).