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

Re: Question about renames

From: <kfogel_at_collab.net>
Date: 2004-11-10 16:07:45 CET

Thomas Hallgren <thhal@tigris.org> writes:
> I'm new to subversion. I'd like to know how the following scenario is
> handled:
>
> Bob checks out a project.
> Bob edits the file foo.txt.
>
> Bill checks out the same project (and version) as Bob.
> Bill moves the foo.txt to directory bar.
> Bill makes some changes to bar/foo.txt.
> Bill commits his changes.
>
> Bob commits his changes.

Bob should get a conflict, because the file he's committing to is no
longer there.

Subversion does not silently move the change to the new location.
(Even after Subversion gets real merge-tracking, it's not definite
that it should do this.)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 10 18:03:52 2004

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