[Soc-2005-dev] CVS merge (again)

[Jiří Hnídek]

Hi,
I tried to do cvs merge again ... without successful result again :-(. I
executed these commands:

$ cvs -z3 -d:ext:jiri at cvs.blender.org:/cvsroot/soc-2005 co -r jiri
soc-blender

$ cd soc-blender

$ cvs update -jHEAD:2005-07-28 -jHEAD

... some files were updated:

U source/blender/blenkernel/intern/modifier.c

but most of files weren't updated and it prints this message:

cvs server: file source/blender/blenkernel/intern/subsurf_ccg.c exists,
but has been added in revision HEAD

No clue, what is wrong, but I will not do cvs merge, until things go so
wrong, becuase I don't want to solve billions of non-existing problems.

Version of my cvs client is: 1.12.9

Content of my ~/.cvsrc file:

cvs -q -z3
diff -up
rdiff -u
update -Pd
checkout -P

You can find output of cvs merge in attachment.

Best regards,

Jiri

-------------- next part --------------
A non-text attachment was scrubbed...
Name: cvs-merge.log.gz
Type: application/x-gzip
Size: 4585 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/soc-2005-dev/attachments/20050803/9e7ea346/cvs-merge.log.bin