Re: svn merge on branches containing moved files/directories

On Fri, Mar 18, 2005 at 04:21:15PM +0100, Volker Hejny wrote:
> Note: That was not I was talking about! Locally-modified files are handled
> carefully and in the same way as 'update' does. The point is, that the
> file is not 'locally modified', but the modification was already comitted
> to trunk. In that case, the file is deleted silently.

But if you run 'svn status' before you commit the merge, you will
see the 'D', right?

Steve

-- 
"Outlook not so good." That magic 8-ball knows everything! I'll ask
about Exchange Server next.
                           -- (Stolen from the net)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org