Re: Merging confuses renamed files

On Monday, August 25, 2003, at 04:32 AM, Ben Collins-Sussman wrote:

> Jack Repenning <jrepenning@collab.net> writes:
>
>>> 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?
>
> $ svn help merge
> merge: apply the differences between two sources to a working copy
> path.
> [...]
> --dry-run : try operation but make no changes
> [...]

Yes, but this doesn't print diffs...

\me drops back to lurker mode now...

Will :-}

--
Dr William Uther                            National ICT Australia
Phone: +61 2 9385 6926             School of Computer Science and 
Engineering
Email: willu@cse.unsw.edu.au             University of New South Wales
Jabber: willu@jabber.cse.unsw.edu.au          Sydney, Australia
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org