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

Re: [PATCH 2/2] git-svn: only look at the root path for svn:mergeinfo

From
EWEric Wong <normalperson@yhbt.net>
Date
Apr 22, 2014, 18:54 UTC
Message-ID
<20140422185459.GA17248@dcvr.yhbt.net>
In-Reply-To
<1397717646-54248-2-git-send-email-stoklund@2pi.dk>
Jakob Stoklund Olesen <stoklund@2pi.dk> wrote:
> Subversion can put mergeinfo on any sub-directory to track cherry-picks.
> Since cherry-picks are not represented explicitly in git, git-svn should
> just ignore it.
Hi, was git-svn trying to track cherry-picks as merge before?

This changes behavior a bit, so two independent users of git-svn may not have identical histories as a result, correct?

Can you add a test to ensure this behavior is preserved? Thanks.

Sorry, I've never looked at mergeinfo myself, mainly relying on Sam + tests for this.

[1] - Historically, git-svn (using defaults) has always tried to
      preserve identical histories for independent users across
      different git-svn versions.  However, mergeinfo may be
      enough of a corner-case where we can make an exception.
Previous: Jakob Stoklund OlesenNext: Jakob Stoklund Olesen
Message 3 of 5 in “git-svn: only look at the new parts of svn:mergeinfo”
  1. 1/2 git-svn: only look at the new parts of svn:mergeinfoJakob Stoklund Olesen, Apr 17, 2014
  2. 2/2 git-svn: only look at the root path for svn:mergeinfoJakob Stoklund Olesen, Apr 17, 2014
  3. Eric WongApr 22, 2014
  4. Jakob Stoklund OlesenApr 27, 2014
  5. Eric WongApr 22, 2014

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.