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

Re: libreoffice merge(tool?) issue #3 ...

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Feb 23, 2011, 13:22 UTC
Message-ID
<4D650A03.8030106@drmicha.warpmail.net>
In-Reply-To
<4D64ED12.5050802@drmicha.warpmail.net>
Michael J Gruber venit, vidit, dixit 23.02.2011 12:18:
Show 9 quoted lines
> Note that you're merging branches which are way off,
> 
> git rev-list --count --left-right
> origin/integration/dev300_m98...stage/ooo/dev300
> 3566    3126
> 
> and that the merge base is quite old:
> 
> af61642 (#i105937# Fixed a few remaining gradient glitches, 2010-01-16)
Following up on this:

git rev-list --count --left-right origin/integration/dev300_m98...stage/ooo/dev300 3566 3126

git rev-list --count --left-right --no-merges origin/integration/dev300_m98...stage/ooo/dev300 2794 2180

git rev-list --count --left-right --no-merges --cherry-pick origin/integration/dev300_m98...stage/ooo/dev300 1136 528

That is, 2500 of these different commits are patch-equivalent (cherry-picks). I don't think "merge" is the best tool to combine "fake" branches like those. You may be better off with rebase... Although I'm wondering what the branch policy was that lead to this.

Michael
Previous: Michael J Gruber
Message 12 of 12 in “libreoffice merge(tool?) issue #3 ...”
  1. Michael MeeksFeb 22, 2011
  2. Brian GernhardtFeb 22, 2011
  3. Michael MeeksFeb 24, 2011
  4. Michael J GruberFeb 25, 2011
  5. Andres FreundFeb 25, 2011
  6. copying git repositories ...Michael Meeks, Feb 28, 2011
  7. Andres FreundFeb 28, 2011
  8. Brian GernhardtFeb 28, 2011
  9. Michael J GruberFeb 22, 2011
  10. Michael MeeksFeb 22, 2011
  11. Michael J GruberFeb 23, 2011
  12. Michael J GruberFeb 23, 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.