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

Rename Support and Merging Workarounds

From: Justin Johnson <justinjohnson_at_gmail.com>
Date: 2007-04-25 18:08:29 CEST

The Subversion book
(http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.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?

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?

Thanks,
Justin

---------------------------------------------------------------------
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:08:52 2007

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