On Nov 11, 2004, at 7:59 AM, Dale Worley wrote:
> Have you actually *tried* any of these? These are areas of Subversion
> that
> have not gotten a lot of attention yet, and you'll get better
> information if
> you try out your specific cases to see how they work than if you ask
> people
> who haven't thought much about them.
>
I can tell you that you'll still be disappointed in Subversion's
handling of these situations. It's not horrible, but it's not ideal,
either.
The main problem is that Subversion doesn't have "true" renames yet,
though we plan to fix that over the next year. A "move" is treated as
a "copy and delete".
So, in your example, if I make local changes to a file, then 'svn
update' wants to move the file to a different location, my edited file
is NOT moved. The working copy instead receives two commands: "add
this new file over here (which has copy-history)" and "delete the
edited file". This isn't particularly dangerous; subversion will
never destroy local edits. So rather than deleting your edited file,
it will simply become unversioned. But it's still annoying. Now
you've got to manually copy your unversioned, edited file on top of the
newly-added copy of an older version of the file. Yick.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 11 15:59:23 2004