Re: Preserving annotations across merges?

[Yves Martin]

On Tue, 2007-08-21 at 16:52 -0700, Chris Johnson (chjohns2) wrote:
> Is it possible to preserve annotations when you merge branches?
>  
> For example, I have two branches A and B. B has bug fixes made to it
> and A has new features. We want to merge B to A, but I'd like to have
> the annotation history merged also. Currently when we do the merge the
> person doing the merge that commits the changes into A, is shown and
> the modifier for all the changes in the annotations for branch A.
>  
> I don't think this is possible, but I thought I'd ask just to make 
> sure.

It takes time for me to understand you speak about the "cvs annotate"
output.
 
You're right, it is not possible to preserve "annotations" when merging.
Or else you may ask developers to commit each patch on the branch A and
on the branch B and also on the head with its own account. Not
reasonable.

In case of doubt on a line, you need to look at the revision log message
for that line saying "merge from branch B from tagX to tagY on branch
A", then checkout tagY on branch B and do another cvs annotate to know
who have written that line.

I'm not sure but I think this information is not kept in Subversion
either. Maybe the future merge tracking will provide enough information
to annotate source properly.

Regards
-- 
Yves Martin