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

Re: svn merge on branches containing moved files/directories

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-15 15:43:18 CET

On Mar 15, 2005, at 4:49 AM, Volker Hejny wrote:

> Dear all,
>
> I'm currently facing a problem, which - after reading all
> documentation -
> I was sure subversion can handle.

Subversion doesn't have moves; it has copies and deletes. And as a
result, it can lead to a lot of confusion.

For example, if a user does 'svn mv A B', it's really exactly the same
as running 'svn cp A B; svn rm A'. Let's say this user then commits
the change.

Meanwhile, a different user has made edits to A. He now runs 'svn
update', and receives not a 'move', but a 'copy and delete' from the
server. His edited A gets deleted (well, not really -- because it's
edited, it merely becomes unversioned), and he receives this new file
called B. But when he looks inside B, he sees it's just a copy of a
*older* version of A.

So no, you're not crazy. Your situation with 'svn merge' is just
another variant on this. When you 'svn merge' your
directory-reorganization branch to a different place, you're not
getting 'moves' of what happens to be there already. You're getting a
bunch of deletes and adds of older things.

This is why, after we finish locking, that "true moves" are the next
big item we want to fix.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 15 15:45:46 2005

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