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

Re: Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions)

From
Sam Vilain <sam@vilain.net>
Date
Aug 30, 2009, 19:41 UTC
Message-ID
<1251661316.25764.4.camel@maia.lan>
In-Reply-To
<m3ocq0km5m.fsf_-_@localhost.localdomain>
On Fri, 2009-08-28 at 08:12 -0700, Jakub Narebski wrote:
>  * svn:mergeinfo contains _per-file_ merge info, so it is much, much
>    more "chatty" than Git multiple parents.

It can. But more often, if you're merging complete paths, you will get complete revision ranges.

See eg https://trac.parrot.org/parrot/browser/trunk

Note how trac is also hiding the branches that were subsequently deleted from the mergeinfo ticket.

>  * The command to merge trunk into branch is different from command to
>    merge branch into trunk.
This is a caveat of url-based branches.
Show 5 quoted lines
> Also IIRC there is warning (well, at least there was in Subversion 1.5
> release notes) that merge tracking doesn't work entirely correctly in
> the face of criss-cross merges (multiple merge bases) and renaming
> (although I do hope that they fixed problem with silent corruption if
> there is rename during merge).

Not sure about that one. I also heard - unconfirmed - that things start to go awry if you start branching off branches and merging around the place. But if that happens it's likely a bug rather than a design flaw (I think).

Sam
Previous: Avery PennarunNext: Dmitry Potapov
Message 15 of 23 in “Using git to track my PhD thesis, couple of questions”
  1. seanhAug 27, 2009
  2. Sverre RabbelierAug 27, 2009
  3. Matthieu MoyAug 27, 2009
  4. Paolo BonziniAug 28, 2009
  5. Matthieu MoyAug 28, 2009
  6. seanhAug 28, 2009
  7. Matthieu MoyAug 28, 2009
  8. Matthias AndreeAug 28, 2009
  9. Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions)Jakub Narebski, Aug 28, 2009
  10. Avery PennarunAug 28, 2009
  11. Matthias AndreeAug 28, 2009
  12. Jakub NarebskiAug 28, 2009
  13. Matthias AndreeAug 28, 2009
  14. Avery PennarunAug 28, 2009
  15. Sam VilainAug 30, 2009
  16. Dmitry PotapovAug 31, 2009
  17. david@lang.hmAug 28, 2009
  18. Paolo BonziniAug 28, 2009
  19. demerphqAug 28, 2009
  20. david@lang.hmAug 28, 2009
  21. demerphqAug 28, 2009
  22. Junio C HamanoAug 27, 2009
  23. demerphqAug 27, 2009

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.