Re: CVS update -j <branch-tag> failes to merge

[Asbjørn Sæbø]

On Wed, May 18, 2005 at 12:53:03PM -0400, Jim Hyslop wrote:
> Asbjørn Sæbø wrote:
> >On Fri, May 13, 2005 at 03:58:12PM -0400, Jim Hyslop wrote:
> >>What version of client and server are you using?
> >
> >
> >Both are 1.12.9 
> 
> Hmmm... I just tried it with 1.12.12, and it worked OK. Can you upgrade 
> to the latest versions and try again?

Now I have tested again, on clean checkouts, with both 1.12.9 and
1.12.12. The results seem to indicate a difference between these two
versions.  With 1.12.12, the expected merging takes place, with 1.12.9
it does not.

Actually, it seems that what makes the difference is whether the client 
is 1.12.12 or not (see below).  When the client is 1.12.12, the merging 
I am expecting takes place.  When the client is 1.12.9, it does not.

(It should be mentioned that I am not totally certain that my repository
is sound.  I installed cvs the normal way ("apt-get install" on a
Debian-based box).  But the actual ldas module is just copied to this
server from another one.  It seems to work, but I am not sure whether
this is the formally correct way to transfer a module to another
server.)


Procedure:
----------
rm -rf ldas
cvs co ldas
cvs update -j dev_20050413_b ldas

The output from the "update -j" command is shown below.  (The output is 
truncated for the cases where merging took place.)



Case 1:
-------
client: cvs 1.12.9
server: 1.12.9

address@hidden:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
address@hidden:~/tmp/tmp$              


Case 2:
-------
client: cvs 1.12.12
server: 1.12.12

address@hidden:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
RCS file: /local/cvs/ldas/Tags,v
retrieving revision 1.17
retrieving revision 1.17.2.2
Merging differences between 1.17 and 1.17.2.2 into Tags
rcsmerge: warning: conflicts during merge
cvs update: Updating ldas/doc
[...]
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
RCS file: /local/cvs/ldas/doc/ldasdoc/spec/specification.tex,v
retrieving revision 1.6
retrieving revision 1.6.4.1
Merging differences between 1.6 and 1.6.4.1 into specification.tex
ldas/doc/ldasdoc/spec/specification.tex already contains the differences 
between 1.6 and 1.6.4.1
[More merging]


Case 3:
-------
Client: 1.12.12
Server: 1.12.9

address@hidden:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
RCS file: /local/cvs/ldas/Tags,v
retrieving revision 1.17
retrieving revision 1.17.2.2
Merging differences between 1.17 and 1.17.2.2 into Tags
rcsmerge: warning: conflicts during merge
cvs update: Updating ldas/doc
[...]
cvs update: Updating ldas/doc/ldasdoc/spec
RCS file: /local/cvs/ldas/doc/ldasdoc/spec/specification.tex,v
retrieving revision 1.6
retrieving revision 1.6.4.1
Merging differences between 1.6 and 1.6.4.1 into specification.tex
ldas/doc/ldasdoc/spec/specification.tex already contains the differences 
between 1.6 and 1.6.4.1
[More merging]


Case 4:
-------
Client: 1.12.9
Server: 1.12.12

address@hidden:~/tmp/tmp$ cvs update -j dev_20050413_b ldas
cvs update: Updating ldas
cvs update: Updating ldas/doc
cvs update: Updating ldas/doc/doxygen
cvs update: Updating ldas/doc/ldasdoc
cvs update: Updating ldas/doc/ldasdoc/developer
cvs update: Updating ldas/doc/ldasdoc/reference
cvs update: Updating ldas/doc/ldasdoc/spec
cvs update: Updating ldas/doc/ldasdoc/usermanual
cvs update: Updating ldas/extracode
cvs update: Updating ldas/orig_src
cvs update: Updating ldas/src
cvs update: Updating ldas/testcode
address@hidden:~/tmp/tmp$ 



Asbjørn