RE: Merging confuses renamed files

Not quite the same, IMHO... 'svn diff' shows you *what* is going to change, 'svn merge --dry-run' only *which files* are going to change... A world of difference.

mvgr,

--Tim

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: zondag 24 augustus 2003 20:32
To: Jack Repenning
Cc: William Uther; dev@subversion.tigris.org
Subject: Re: Merging confuses renamed files

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
[...]

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Aug 24 22:30:50 2003