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

Re: Problems merging renamed file with contents changes

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-09-12 06:49:19 CEST

There is a "back story" to why rename is implemented as delete+copy
instead of as a single primitive. It's the scenario where someone
updates a tree in such a way as to receive only one side of a rename
event.

For example, Joe does

   $ svn rename foo/blah.c bar/blah.c

Then, Veronica does

   $ cd foo # (or bar)
   $ svn update

When Veronica updates, she should experience the delete (or copy) that
occurred in the tree she's updating, yet *not* experience the
corresponding other event, since that occurred in a place she's not
updating.

I'm not sure how this affects the discussion. Perhaps we just weren't
imaginative enough when we were implementing rename, and it's actually
possible to have atomic renames and also have Veronica's update work
correctly. I just wanted to explain the back story, and make sure
that people keep the scenario in mind when they're thinking about this
problem.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 07:11:48 2002

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