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

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."


Colm A

Mark Phippard wrote:

I finally got that blog post published.


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.



 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

The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s). Please direct any additional queries to: communications@s3group.com. Thank You. Silicon and Software Systems Limited. Registered in Ireland no. 378073. Registered Office: South County Business Park, Leopardstown, Dublin 18

--------------------------------------------------------------------- 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.