[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: Brandon Ehle <azverkan_at_yahoo.com>
Date: 2002-12-08 21:55:03 CET

>>Diffing a and b with diff(1) produces a meaningful diff.
>>Diffing the two gnuserv.c versions with diff(1) or diffing with
>>svn when they share ancestry produces the meaningful diff,
>>diffing with svn they *don't* share ancestry produces a useless
>You keep repeating "useless". OK, I'll keep repeating "correct".
>Your "useless" result shows me that the files are not related? How is
>that useless?
Subversion is a tool, its supposed to make your project easier. If
every time we want to merge unrelated files or directories we have to
checkout 3 working copies and manually do a 3 way merge, Subversion
isn't being very useful.

>I guess the question I really have is: why you don't just ensure that
>your files have the proper revision history? If they did, Subversion
>would do what you want.
Because the people on this list are not going to be the only people who
use Subversion. Inevitably, you are going to run into a case where
someone has been implementing vendor branches using imports, after all
the first vendor branch was brought in using import, why wouldn't you
bring in the second version of the vendor branch the same way?

If its decided that Subversion won't support logical diffs between
unrelated files, then we should at least make a specialized vendor
import that automatically generates the ancestry, or the ability to
create ancestry for files that currently have no ancestry at a later time.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 8 18:52:24 2002

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