[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: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-09-22 02:29:37 CEST

> 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.

Mark

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

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