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

[Chris Want]

Hi Jiri,

2 things:

1) The last time you merged was July 18th so you should
merge the changes since, say, July 19th and now (instead of
the changes since July 28).

2) I find the following works well with your branch, with conflicts in
only the files you might expect them:

cvs up -kk -j BLENDER_DIST:2005-07-19 -j BLENDER_DIST

I don't know what the difference is between HEAD and BLENDER_DIST,
but it seems to work better with BLENDER_DIST.

Regards,
Chris


Jiří Hnídek wrote:

> 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
>
>------------------------------------------------------------------------
>
>_______________________________________________
>Soc-2005-dev mailing list
>Soc-2005-dev at blender.org
>http://projects.blender.org/mailman/listinfo/soc-2005-dev
>  
>