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

Re: Moved files are not merged

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-11-11 16:12:50 CET

On 11/11/05, Christoph Bartoschek <bartoschek@or.uni-bonn.de> wrote:
> Hi,
> I have the following problem:
> In one working copy a user modifies a file. In another one the file is moved
> to another location. The second change is commited and the first user makes
> an update. Now the changes made to the file are not merged to the new
> filename.
> How can one get the correct behaviour?
What version are you using? I think this may have been fixed in 1.3,
but I can't find an issue (closed or open for it).

> Another question which is somewhat related. Why are moves implemented as
> delete+add and not as moves? I guess the error lies in this implementation
> detail.
I believe that this was simpler and got most of the desired behavior, while
allowing for improvement in the future. It is being worked on.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 11 16:16:19 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.