Re: Problem with merge tracking in 1.5.0
From: Colm Aengus Murphy <colm.murphy_at_s3group.com>
Date: Wed, 16 Jul 2008 10:57:25 +0100 Hi Mark, Thanks for the info. It might be worth to update the red-bean doc in the section where it describes that you can continually perform reintegration merges. "Now that your branch is merged to trunk, you have a couple of options. You can keep working on your branch, repeating the whole process of occasionally syncing with the trunk and eventually using --reintegrate to merge it back again. Or, if
you're really done with the branch, you can destroy your working copy
of it and then remove it from the repository."Regards Colm A Mark Phippard wrote: Colm, I finally got that blog post published. http://blogs.open.collab.net/svn/2008/07/subversion-merg.html It explains some of the issues with merge and reintegrate. Your issue is covered near the end under the Branch Management section. In your reproduction, Subversion is behaving as expected. You would probably want to handle this situation by deleting branches after they are reintegrated and then create them again if necessary. Thanks Mark -- --------------------------------------------------------------------- Colm Aengus Murphy, Tel : +353 1 2911000 Release Manager, Direct Tel: +353 1 2911373 Consumer Mobile, Silicon & Software Systems, Fax : +353 1 2911001 South County Business Park, Leopardstown, E-mail: colm.murphy@s3group.com Dublin 18. WWW : www.s3group.com Ireland ---------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on 2008-07-16 11:57:54 CEST
|
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.