[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn diff, svn merge, and vendor branches (long)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-12-07 19:06:22 CET

Greg Hudson <ghudson@MIT.EDU> writes:

> I would just say that the reduction of the file case to the
> directory case is rather lossy, and (as you seem to have agreed, after
> looking at the merge code) should be replaced with special handling.

Not quite, I said they should be the same, I didn't specify which
should change :)

It is probably fairly simple to reuse the merge code for diff,
although it may involve an extra round trip to the server to determine
whether a given URL is a file or directory. One problem I forsee:
when we get as far as recording merge history, how are we going to
record the merge of the difference between two unrelated files? Will
subsequent merge-history-aware merges use that information?

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 7 19:07:02 2002

This is an archived mail posted to the Subversion Dev mailing list.