merge patterns

I have a branch for my currently shipping release.

And many changes have been made on trunk since the branch was made

All changes made in the branch have been merged to trunk.

Recently we created a new branch off of trunk and developed a new
feature in there.

Now we have decided to release that feature as the next minor update to
our shipping release. So I will merge everything from the project branch
to the release branch. No big deal so far.

My question is, which is the better practice? Merge these same changes
from the project branch to trunk? Or should I merge them from the
release branch to trunk?

If I merge from the release branch to trunk, will svn mergeinfo be smart
enough to tell me that everything in the project branch has been merged
to trunk? Or will I have to run two reports?

JLM

Jeremy Mordkoff

Director, QA, IT & Release

ZeeVee, Inc.

One Monarch Drive | Littleton, MA 01460

Office: 978.467.1395 x233 | Fax: 978.467.1404

Mobile: 978-257-2183

jlm_at_zeevee.com <mailto:jlm_at_zeevee.com>

www.zeevee.com <http://www.zeevee.com/>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2401402

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-28 22:39:07 CEST