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. > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html