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

git-svn mergeinfo

From
BGBrice Goglin <brice.goglin@gmail.com>
Date
Sep 11, 2012, 12:01 UTC
Message-ID
<504F27FD.6020204@gmail.com>
Hello,

I am using git 1.7.10.4 from Debian. I just tried svn.pushmergeinfo and it seems to have worked fine, great.

Now I am trying to understand what the doc says about this: "Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."

"all parents but the first have already been pushed into SVN" means that merging A into B requires to dcommit in A first, right? "non-fast-forward" means that both branches got some commits since the last merge, right?

Could we add an example after the above doc sentence? Something like "For instance, if merging SVN branch B into A, make sure you dcommit A first, and check that both A and B got new commits since the last merge (or since B was created from A)".

Brice
Message 1 of 1 in “git-svn mergeinfo”
  1. Brice GoglinSep 11, 2012

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.