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

Re: [Subclipse-users] Changed files and then an update where the file (or directory) is moved/renamed..

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 30 May 2008 10:21:24 -0400

On Fri, May 30, 2008 at 9:45 AM, Johan Compagner <jcompagner_at_gmail.com> wrote:
> I just read the other thread about moving dirs with changed files. And i
> thought i also have such
> a thing but a bit different.
>
> Now i have changed files but another renamed it or (this was really the
> case) renamed/moved the complete dir.
>
> What happens then after the update is that my changed files still are in old
> dir. As outgoing additions
> And i have the new dir that is clean.
>
> What would be nice if subversion of subclipse would see that and moved by
> changes with it.
>
> Because now i dont know if the other person also changed the file.. So i
> cant just copy over it
> i have to merge manually my changes back into the file which can be time
> consuming.

Yes, this is all true. This is a known limitation in the handling of
renames in Subversion.

http://markphip.blogspot.com/2006/12/subversion-moverename-feature.html

Some work is going into this area in Subversion 1.6, although it is
going to be more about flagging conflicts when this happens so that
the situation is made more obvious. In some cases, hopefully it will
also just move the file and apply your updates to it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-05-30 16:21:34 CEST

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