[Soc-2005-dev] CVS merge

[Chris Want]

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)