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

git-svn detects some merges incorrectly from svn:mergeinfo

From
Tuomas Suutari <tuomas.suutari@gmail.com>
Date
Feb 22, 2010, 07:57 UTC
Message-ID
<1266825442-32107-1-git-send-email-tuomas.suutari@gmail.com>
Hi,

Now that git-svn detects merges from svn:mergeinfo, I thought it's time to re-import some of my SVN repos with git-svn. Detecting of the merges worked mostly well, but when inspecting the imported history with gitk, I found some incorrectly detected merges.

This patch series adds a test case and a fix for the case.

I was a bit uncertain if the fix should go to parents_exclude function or to "cater for merges which merge commits from multiple branches" section of find_extra_svn_parents function. I chose the latter and at least it does the trick.

-- 
Tuomas
Next: Tuomas Suutari
Message 1 of 10 in “git-svn detects some merges incorrectly from svn:mergeinfo”
  1. Tuomas SuutariFeb 22, 2010
  2. 1/3 t9151: Fix a few commits in the SVN dumpTuomas Suutari, Feb 22, 2010
  3. Sam VilainFeb 24, 2010
  4. 2/3 t9151: Add two new svn:mergeinfo test casesTuomas Suutari, Feb 22, 2010
  5. 3/3 git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari, Feb 22, 2010
  6. Thomas RastFeb 22, 2010
  7. Tuomas SuutariFeb 22, 2010
  8. 3/3 git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari, Feb 22, 2010
  9. Thomas RastFeb 23, 2010
  10. Eric WongFeb 26, 2010

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.