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

Re: git-svn and mergeinfo

From
BJBryan Jacobs <bjacobs@woti.com>
Date
Aug 31, 2011, 16:55 UTC
Message-ID
<20110831125557.56ccffe2@robyn.woti.com>
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

Previous: Sverre RabbelierNext: Sverre Rabbelier
Message 7 of 14 in “git-svn and mergeinfo”
  1. Bryan JacobsAug 29, 2011
  2. git bug reportingJeff King, Aug 29, 2011
  3. Bryan JacobsAug 29, 2011
  4. Junio C HamanoAug 29, 2011
  5. Sverre RabbelierAug 31, 2011
  6. Sverre RabbelierAug 31, 2011
  7. Bryan JacobsAug 31, 2011
  8. Sverre RabbelierAug 31, 2011
  9. Michael HaggertySep 1, 2011
  10. Bryan JacobsSep 1, 2011
  11. Junio C HamanoSep 1, 2011
  12. Carlos Martín NietoSep 6, 2011
  13. Bryan JacobsSep 6, 2011
  14. Carlos Martín NietoSep 6, 2011

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.