Re: merging the same version again and again and again and again and ...

[Harald Dunkel]

Hi Ingolf,

Ingolf Steinbach wrote:
> Harald Dunkel wrote:
> [...]
>> % cvs update -j cde2006_hop1 README
>> RCS file: /sceng/cvsroot_cde/config/README,v
>> retrieving revision 1.31.4.3
>> retrieving revision 1.31.4.3.2.13
>> Merging differences between 1.31.4.3 and 1.31.4.3.2.13 into README
> [...]
> 
> Could you please send us the output of
> 
> % cvs diff -r1.31.4.3 -r1.31.4.3.2.13 README
> 
> I could imagine that they are identical. Is that right?
> 

No, 1.31.4.3 is the base version, used to start branch
cde2006_hop1. The top level versions of both branches
are identical, but the diff between the top and the base
version has 1053 lines.

> With your cvs update command, you state that you want to
> merge the changes from the cde2006_hop1 branch into your
> working copy. There have been changes to the README file
> in that branch (13 revisions). These changes are then
> merged into your local README. It does not matter that
> the 13th revision in that branch is the same as the original
> version.
> 

It seems that this is a different case than what I have.

My problem is that for some files (but not for all)
"cvs -j cde2006_hop1" reports that the file had to be
merged, and then looking at the file it turns out that
the new version is identical to the previous one. And
even worse, on the next run cvs does the same again.

This should not happen. I would like to keep CVS shut up
if it doesn't have to do anything.


Regards

Harri