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

Re: Needing advice

From: Steve Sisak <sgs_at_codewell.com>
Date: 2007-10-02 20:51:12 CEST

At 1:37 PM -0500 10/2/07, pablasso wrote:
>Thanks Johnathan and Rodrigo, i finally merged my whole branch into
>trunk, although i spent several hours on it, using tools as
>SmartSynchronize proved a lot less painful than i though, I'll just
>make sure to merge periodically in the future and save me all this
>hassle.

One other thing that might work better for you in the future:

Rather then branching to continue development, you can create a
branch for your release and continue development on the trunk, since
usually your release code is somewhat frozen, except for critical bug
fixes.

You then then apply very targeted bug fixes on the release branch as
well as use it for maintenance releases of the older version.

HTH,

-Steve

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 2 20:52:48 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.