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

Re: git-svn and mergeinfo

From
Carlos Martín Nieto <cmn@elego.de>
Date
Sep 6, 2011, 14:28 UTC
Message-ID
<1315319309.9839.13.camel@bee.lab.cmartin.tk>
In-Reply-To
<20110906095256.205dd5d0@robyn.woti.com>
On Tue, 2011-09-06 at 09:52 -0400, Bryan Jacobs wrote:
Show 16 quoted lines
> On Tue, 06 Sep 2011 14:56:38 +0200
> Carlos Martín Nieto <cmn@elego.de> wrote:
> 
> > You can also save the mergeinfo to a file, add the line, and use
> > --mergeinfo=$(cat /tmp/some-file) to set it. It is indeed awkward, but
> > blindly replacing every space with a newline is not always the right
> > option. If a merged directory contains a space, this change will break
> > the mergeinfo, even if you're properly quoting your variable or using
> > the $(cat /some/file) method.
> > 
> > Cheers,
> >    cmn
> 
> Ah, a situation I neglected to consider! Perhaps we should revert this
> patch, since I worked up the initiative to write an
> auto-populating-mergeinfo patch for git-svn anyhow.

As it can cause regressions, I think reverting is the right option. And since git-svn is going to learn to do it by itself, the functionality isn't a big loss.

Cheers,
   cmn
Previous: Bryan Jacobs
Message 14 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.