[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: Jon Watte <hplus_at_mindcontrol.org>
Date: 2002-09-12 23:23:33 CEST

> 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

This is not insurmountable at all. Just because "rename" is atomic in
the repository doesn't mean it has to be implemented by "mv" when you
update (although it would be nice from a bandwidth point of view).

There are several possible solutions:

1) Implement rename as atomic on the change generation side and in the
   repository, but push it out to updating clients as copy+delete

2) Legislate that you only get rename updates when you update in the
   {source/destination:choose one} location. This would mean that the
   expectation in your scenario is explicitly declared wrong.

3) Be Really Smart (tm) about updating, and send a "rename" event both
   when updating in source and when updating in destination. The client
   would then do the re-link if it's getting both in the same operation,
   but do a get or delete if it's doing a single-sided update.

Cheers,

                        / h+

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 23:25:41 2002

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