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

Re: Branching / Merging Help

From: Olivier Dagenais <olivier.dagenais_at_formark.com>
Date: 2007-05-23 00:21:22 CEST

> Ok, I did a test where I first merged the latest trunk into the
> branch, and then merged the branch back into the trunk. The example
> would be:
> Does this sound correct, as to how I should be using the
> branching/merging mechanism? Thanks for the help!

As far as I understand it, yes. However, we recently made a few
observations as to unexpected (to us) behaviour:


...which was very recently (i.e. this morning) answered:


So, yes, but caveat emptor!

Olivier Dagenais
Software Engineering / Génie logiciel
Formark - Combine the Best of SharePoint® and Livelink®
Phone: 613-599-5173 ext 238
Make sure you don't miss anything: subscribe to the Formark Newsletter:

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 23 00:21:35 2007

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.