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

RE: Rename Support and Merging Workarounds

From: Irvine, Chuck R [EQ] <Chuck.R.Irvine_at_Embarq.com>
Date: 2007-04-25 18:34:10 CEST

> The Subversion book
> (http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copych
> anges.html#svn.branchmerge.copychanges.bestprac.moves)
> mentions the problem where renames (copy and delete) on a
> my-branch will wipe out changes on trunk when merged from
> my-branch to trunk, since it will simply delete the file and
> add the new file instead of incorporating the changes from
> trunk first.
> The book mentions the problem and that users should be aware
> of it, but a solution or work around isn't mentioned. This
> problem seems to make merging a very manual process where
> users have to keep a close eye on things, manually apply
> various diffs after looking through logs, to ensure that no
> changes are lost.
> Does anyone have any suggestions on how to manage this? Is
> it really as manual of a process as it seems?

There are some threads on the mailing list that discuss proposals for
manual processess, scripts, etc, to deal with this problem. You might do
a search to locate these threads.

Also, I've heard that there may be some activity underway by Subversion
experts to put together documentation on how to avoid, workaround,
detect, and/or correct this problem. I'm not sure of this, however.

> Also is there any idea when true rename support will be
> added? Is
> http://subversion.tigris.org/issues/show_bug.cgi?id=898
> correct and it will not be included in 1.5?

The latest info is that this functionality is being considere for
inclusion into 1.6.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 25 18:34:31 2007

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