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

RE: Handling of move/rename on merge

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-07-02 21:57:19 CEST

This sounds somewhat similar to what I was doing recently, search the archives for my name if you're interested in my experience. Someone has already posted about the reasons why it happens. I ended up reporting a bug
which was then marked as a duplicate of

The thing that still bugs (sic) me is that I was attempting to do the "radical reorganization" scenario as described in the book, but it turns out to be much more complicated (and incomplete) to use the example solution that is then described.
Let's say that you've been given the task of performing a radical reorganization
of the project. It will take a long time to write, and will affect all the files
in the project. The problem here is that you don't want to interfere with Sally,
who is in the process of fixing small bugs here and there. She's depending on
the fact that the latest version of the project (in /calc/trunk) is always
usable. If you start committing your changes bit-by-bit, you'll surely break
things for Sally.

I don't intend to do any more radical reorganization any time soon, thank goodness ;-)


NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 2 22:03:20 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.