Mark Phippard schreef:
> 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
> Yes, this is all true. This is a known limitation in the handling of
> renames in Subversion.
> 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.
It is indeed something very annoying. I think a good solution would be
to simply warn the user if he attempts to edit a file which is in a
moved directory, telling him to commit it first.
I reverted my changes, which made svn think the files were not under
version control, and comitted them afterwards. That worked, but the
file’s history is lost.
Can I get it back somehow?
Ask smart questions, get good answers:
Received on 2008-06-03 15:58:39 CEST