[Soc-2005-dev] CVS merge

[Jiří Hnídek]

Hi Chris,
cvs merge works better with

cvs update -jHEAD:2005-07-18 -jHEAD

BUT

1) it prints lot of error messages to stderr like this one:

cvs server: file source/blender/yafray/intern/yafray_Render.h exists, 
but has been added in revision HEAD

2) you forgot to remove following files from cvs repository:

source/blender/src/editika.c
source/blender/makesdna/DNA_ika_types.h
source/blender/blenkernel/intern/ika.c

These files aren't in bf-blender cvs anymore and existence of these 
files breaks compilation ...

I guess, that you didn't try to compile soc-blender after your cvs 
merge, right ... imagine, that 10 developers will try to do cvs merge in 
their branches, thinking, that HEAD is ok ... I will commit necessary 
changes to HEAD.

3) I have to solve lot of problems in files, which I have never edited 
:-( it seems, that some files weren't updated ... stupid cvs :-(

Jiri

> Hi Nils,
> 
> It is merging the difference between HEAD
> on 2005-07-18 (probably at midnight) and
> HEAD at the present time, then trying to
> apply that difference to your branch.
> 
> I think when you just do the one -jHEAD it
> does the difference between HEAD's initial
> revision and HEAD at present time -- if you
> already merged before, then it will regard
> those already merged changes as conflicts.
> 
> Anyways, that's my understanding of what it's
> doing, be it right or wrong -- cvs is weird!
> 
> Chris
> 
> Nils Thuerey wrote:
> 
>> Hello,
>>
>>
>>> Actually, better make it:
>>> cvs update -jHEAD:2005-07-18 -jHEAD
>>
>>
>> That seems to work better - no conflicts then... Stupid question, but
>> what is that command doing? Updating with the version of july 18th? When
>> I run a "cvs update -jHEAD" afterwards, I get the conflicts again...
>>
>> Regards,
>> -> Nils
>>
>>
>>> (the date should be the day before the merge)