Johan Corveleyn wrote on Fri, Jan 14, 2011 at 23:52:10 +0100: > Ok, after rereading this thread, I'm starting to understand what you > mean: why would "merge" perform an expensive diffing algorithm while > it can just be 100% sure that it can simply copy the contents from the > source to the target (because the target file has not had any changes > since it was branched)? > > I think it's a good suggestion, but I can't really comment more on > (the feasibility of) it, because I'm not that familiar with that part > of the codebase. I've only concentrated on the diff algorithm itself > (and how it's used by "svn diff" and "svn merge" (for text files)). > Maybe someone else can chime in to comment on that?
In other words, merging changes from file.c@BRANCH to trunk should detect that file@trunk and file@BRANCH@BRANCH-CREATION are the same node-revision? I don't know whether it does that... but giving the question more visibility (as opposed to burying it in the middle of a paragraph on users@) might help you get an answer. :-)
