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

Re: [PATCH] git-svn: avoid self-referencing mergeinfo

From
EWEric Wong <normalperson@yhbt.net>
Date
Apr 4, 2013, 01:31 UTC
Message-ID
<20130404013131.GA18539@dcvr.yhbt.net>
In-Reply-To
<20130330220642.GA14641@gmail.com>
Michael Contreras <michael@inetric.com> wrote:
Show 10 quoted lines
> When svn.pushmergeinfo is set, the target branch is included in the
> mergeinfo if it was previously merged into one of the source branches.
> SVN does not do this.
> 
> Remove merge target branch path from resulting mergeinfo when
> svn.pushmergeinfo is set to better match the behavior of SVN. Update the
> svn-mergeinfo-push test.
> 
> Signed-off-by: Michael Contreras <michael@inetric.com>
> Reported-by: Avishay Lavie <avishay.lavie@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

80-column wrapped version pushed to git://bogomips.org/git-svn master (commit e5ee78e1f0835410a37bfa38e1ff5e1a82f8c7b5)

Will ask Junio to pull unless Sam (our mergeinfo expert) gives a NACK soon.

Previous: Michael Contreras
Message 2 of 2 in “git-svn: avoid self-referencing mergeinfo”
  1. git-svn: avoid self-referencing mergeinfoMichael Contreras, Mar 30, 2013
  2. Eric WongApr 4, 2013

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.