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

Re: Misinforming the user on rename with local changes

From: Nicklas Norling <exinor_at_exinor.net>
Date: 2004-11-11 17:51:10 CET

François Beausoleil wrote:

> Hi !
>
> Thomas Hallgren over on the user's list has brought up a case that
> might result in partial dataloss:
> http://svn.haxx.se/users/archive-2004-11/0434.shtml
>
> The use case is as follows:
> Quoting Thomas Hallgren:
> > 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.

<snip>

> My conclusion was that this can result in potential dataloss if Bob
> updates and then commits, without running status. His local changes
> to lib/file.txt won't make it to the repository, but the rest of his
> changes will.
>
> The solution ? svn update should say if it /unversions/ (is that a
> word ?) a file.
>
<snip>
Shouldn't update move the users file to the new location and then
proceede with a normal patch (possibly
resulting in a conflict)? It seems to me svn alread know all it needs in
order to do this automatically?
Of course if the file was svn removed and then svn added it should just
be removed from versioning.
/Nicke

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 11 17:51:36 2004

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