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

Re: Merging confuses renamed files

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-08-23 02:56:30 CEST

At 10:33 AM +1000 8/23/03, William Uther wrote:

> I view diff as a dry-run of merge and if merge is going to delete
>and re-add lots of lines, then I want to know that.

My questions about diff's honorable ancestors notwithstanding .. what
if merge had a "--dry-run" switch, that really actually guaranteedly
showed you what merge would do without actually doing anything?
Would that take the pressure off diff to be "just like merge"?

-- 
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 23 02:57:25 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.