Re: Merging confuses renamed files

Jack Repenning <jrepenning@collab.net> writes:

> At 10:33 AM +1000 8/23/03, William Uther wrote:
>> I'm a user who has been on the list a while, and thought about this
>> a bit, and I think I'd rather have diff honour ancestry

Me too.

> I'm still trying to understand what that means. Can you help poor me?
> I think diff has the job of printing things to the screen; what's the
> difference between what's printed, with or without "honorable
> ancestors"?

Here is an example

 $ svnadmin create repo
 $ svn mkdir -m "" file://`pwd`/repo/foo
 $ svn import -m "" svn-config file://`pwd`/repo/foo/bar
 $ svn cp -m "" file://`pwd`/repo/foo file://`pwd`/repo/foo2
 $ svn rm -m "" file://`pwd`/repo/foo2/bar
 $ svn import -m "" Makefile file://`pwd`/repo/foo/bar

Now running

 $ svn diff --notice-ancestry file://`pwd`/repo/foo file://`pwd`/repo/foo2

shows foo/bar being deleted and foo2/bar being added, while

 $ svn diff file://`pwd`/repo/foo file://`pwd`/repo/foo2

shows a unifed diff between the two files imported as bar.

Some people think the unified diff should be the default because the
files have the same name, others think the add/delete should be the
default because that's what the history records.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org