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

Clarification on merging branch back into trunk.

From: John Schulz <subscription_at_ambientshadow.com>
Date: 2004-12-31 18:27:29 CET

I was just reading Common Use-Cases for Merging in the Subversion book
<http://svnbook.red-bean.com/en/1.1/ch04s04.html>, and had a question
about the procedure.

It says the faulty process of comparing the HEAD of the trunk with the
HEAD your branch is bad because: "it would not only show the addition
of your branch changes, but also the removal of trunk changes that
never happened on your branch."

What struck me was "removal of trunk changes that never happened on
your branch." Because of that, I was expecting (1) an instruction to
"make sure your branch is up-to-date with trunk changes", or something
similar, or (2) the first step in the merge to incorporate the latest
trunk changes into the branch, as covered in Copying Specific Changes.

Is my assumption correct?

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 Fri Dec 31 18:29:43 2004

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.