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

Re: Clarification on merging branch back into trunk.

From: John Schulz <john_at_gogeek.org>
Date: 2004-12-31 19:55:19 CET

On Dec 31, 2004, at 12:16, Kris Deugau wrote:

> On a longer development cycle, you may
> end up merging from the trunk into your branch to make sure you don't
> wander too far from the trunk (IIRC this is mentioned in the book).

You are correct; this was actually the scenario on which I was basing
my assumption.

> In general terms, I would personally recommend NEVER trying to compare
> trunk with a branch unless that's what you are really looking to do;
> always compare a branch's HEAD with an earlier revision of that branch,
> or trunk's HEAD with an earlier revision of the trunk.

I hadn't thought of the security fix / feature-frozen branch
possibilities. Thanks for the specific, real-world examples; you
answered my question completely. :-)

--
John Schulz (john@ambientshadow.com)
Web Development / Graphic Design / Usability Consulting
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 2 21:01:34 2005

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