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

Re: svn merge on branches containing moved files/directories

From: Volker Hejny <V.Hejny_at_fz-juelich.de>
Date: 2005-03-18 17:13:44 CET

On Fri, Mar 18, 2005 at 09:31:51AM -0600, Steve Greenland wrote:
> 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?

This is correct, of course. However, it does not help, because there
are a lot of other files with 'D', which had not been changed since
the branch was created. The problem is to identify those files, which
were changed/added since the branch was created _and_ are going to be
deleted now.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 17:16:17 2005

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

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