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

RE: encouraging users to switch

From: John Kristian <John.Kristian_at_Siebel.com>
Date: 2005-02-11 21:11:28 CET

Dale Worley wrote:
> it's a merge failure -- one side is adding a file to a directory,
> but the other side is deleting the directory.

Not really: the directory wasn't deleted; it was moved. The file can
and should be added to the new directory (the destination of the move).
By executing `svn move` I implicitly sent the message that I'm deleting
the old branch. My mistake: `svn copy` was a better choice.

It would be helpful (as others have suggested) to enhance Subversion to
understand when something moves, and propagate the move to other working
copies gracefully. Has anyone filed such an enhancement request? Shall
I?

- John Kristian

-----Original Message-----
From: Dale Worley [mailto:dworley@pingtel.com]
Sent: Friday, February 11, 2005 11:17 AM
To: users@subversion.tigris.org
Subject: RE: encouraging users to switch

Actually, svn shouldn't be doing that, if it is following the rule of
"never discard local changes". In principle, it's a merge failure --
one side is adding a file to a directory, but the other side is deleting
the directory.

Dale

-----Original Message-----
From: John Kristian [mailto:John.Kristian@Siebel.com]

... `svn update` discards the list of uncommitted additions and
deletions. After `svn switch`, I must `svn add` all the new files
again, and `svn delete` all the deleted files again. Deletions are
especially difficult, because there's no list of them in my working copy
(that I can find). Imagine I was refactoring viciously, with hundreds
of uncommitted additions and deletions in my workspace. Must I go back
and reconstruct the list of files that I moved? Groan.

------------------------------------------------------------------------------
Siebel CRM OnDemand. Proven Results for Any Size Company. www.crmondemand.com

This e-mail message is for the sole use of the intended recipient(s) and contains confidential and/or privileged information belonging to Siebel Systems, Inc. or its customers or partners. Any unauthorized review, use, copying, disclosure or distribution of this message is strictly prohibited. If you are not an intended recipient of this message, please contact the sender by reply e-mail and destroy all soft and hard copies of the message and any attachments. Thank you for your cooperation.
====================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 11 21:14:49 2005

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