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

RE: Updating after an uncommitted move

From: Greg Irvine <greg.irvine_at_thalesatm.com>
Date: 2005-09-22 03:22:22 CEST

Thanks Mark.

I had a strange problem however, when I tried to revert out of my move
refactoring. The response to the revert command was that the file was not
versioned and it wouldn't revert.

I then had problems just trying to delete the file manually, etc. I don't
remember exact details I'm afraid.

-----Original Message-----
From: Mark Phippard [mailto:MarkP@softlanding.com]
Sent: Thursday, 22 September 2005 10:30 AM
To: users@subclipse.tigris.org
Cc: users@subversion.tigris.org
Subject: Re: Updating after an uncommitted move

> If I move a class to a new folder but don't commit it and then do an
update that includes
> modifications to the file I've moved, the update recreates the file in
its original spot but also
> leaves the one I've moved in it's new place.
> Is this expected behaviour I'm supposed to manually handle or should the
updates be merged
> into the file at its new location?

As I understand things, that is the expected behavior. There is similar
behavior if you had local updates to a file and you did an update where
someone else had moved the file. In that case, the local file become
unversioned so your changes are not lost.


Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM
Email Security Management Services powered by MessageLabs.
Received on Thu Sep 22 11:22:22 2005

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

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