[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: <cmpilato_at_collab.net>
Date: 2002-12-09 20:01:57 CET

Ben Collins-Sussman <sussman@collab.net> writes:

> Greg Hudson <ghudson@MIT.EDU> writes:
>
> > I wonder if the right answer isn't to just punt the (distance == -1)
> > check from delta_dirs(). Is there a real penalty for expressing a file
> > as a delta against something unrelated?
>
> Well, I was pondering this question too. We use dir_delta all over
> the place... svn diff, svn merge, svn up, svn switch. Is there ever a
> time where we definitely *should* see a delete+add instead of a patch?
> I think cmpilato had an example.

Actually, that was you that had the example. :-)

Simply, if a user replaces a file altogether, folks that run 'svn up'
will do this as only a textual modification to the file. Instead of:

   D foo.txt
   A foo.txt

they see only:

   M foo.txt

Even more insanely, consider a directory that was replaced. And
consider that the new directory might have even had some files with
the same name as those in the old directory. The user would see what
looks like a really weird diff that doesn't actually represent the
semantic change that occured:

   D dir/foo.txt
   M dir/README
   A dir/README.win32
   D dir/subdir/A.txt
   D dir/subdir/B.txt
   M dir/subdir/INSTALL
   A dir/another_dir
   A dir/another_dir/bar.txt
   ...
   
Is this a bad thing? I can't say (and apparently Ben now can't either).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 9 20:07:09 2002

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