Re: Knowing that a merge has happened

[Andrew Johnson]

Steve Bement wrote:
> 
> Once I have merged the branch into the main trunk, is there a way I can
> look at revision 1.5, and know that it does indeed contain code merged
> in from 1.2.2.2?  In other words, back on the main branch, how do I know
> that the merge actually took place?

No. When the person doing to merge checks in the merged code, he should
include words to that effect in the commit message for 1.5.  It is also
recommended if your development process could involve multiple merges from
the same branch that you create a tag on the branch that indicates where
the last merge to trunk was done from, in your illustrated case 1.2.2.2
for that file.  You'll need that tag for future merges to avoid getting
conflicts flagged over the changes that were made before the first merge.

Basically there's nothing recorded by CVS to give you this information,
you have to record it yourself using the facilities available (or in some
other manner).  As the manual stresses, CVS is not a substitute for
communication.

- Andrew
-- 
The world is such a cheerful place when viewed from upside-down
It makes a rise of every fall, a smile of every frown