Re: About merging when no CVS dir are present (David D)

[David D]

Yeah it's cvs update -A (the most recent version of files), here I have
conflicts :

One of them was about I have a production and a dev verson of a file.
I was adviced to make a makefile :
my file config.php no longer belong to cvs, I would hava a config.template n
make a :
make prod :
sed "/prod-dir/tpl-dir" ....
or
make dev :  ...
I thinks it s a great idea, dont think ?

Another question is what was doing the cvs update (without -A) i make ?
Does it have any consequences ?

thanks.

>
> >But I update no conflits where found cool,
> >But when I commit I hava a lot of messages like this :
> >cvs commit : connot commit with sticky date for file 'toto/toto.php'
> >I dont know what to do ?
>
> It looks like you need to pass the '-A' argument to the update command in
the first instance - see the following section of the Cederqvist:
>
>   http://www.cvshome.org/docs/manual/cvs_4.html#SEC53
>
> I suspect that without the '-A' argument, your initial update is doing
very little (hence no conflicts)...
>
> You may also find the following link useful:
>
>   http://cvsbook.red-bean.com/cvsbook.html#update
>
> Kind Regards,
> Duncan.
>
>
>
> _________________________________________________________
> Do You Yahoo!?
> Get your free @yahoo.com address at http://mail.yahoo.com
>
>