[dev] [cvs|of topic] How to prevent white spaces conflict on CVS update

[Jan Schneider]

Zitat von Mathieu CLABAUT <mathieu.clabaut@free.fr>:

> 
>  Hello all,
> 
>   It's a bit out of topic, but in my attempts to use CVS, I'd like to
>  know if it is possible to prevent CVS from generating conflicts on
>  white spaces  when merging two revisions (I do know that white spaces
> are
>  not significant in this case, no strings or things like that...).
> 
>   It is possible to do a cvs diff -Bbw, to see the diff, but how to
> tell
>  cvs to do the same when internally diffing for merging (if it is
>  possible)?
> 
>   Thanks for any advices....

The only thing that comes to my mind is to generate a patch file by 
redirecting the output of a cvs diff command ignoring whitespaces. You can 
then use patch to apply this file against the files that need merging.

Jan.

::::::::::::::::::::::::::::::::::::::::
AMMMa AG - discover your knowledge
:::::::::::::::::::::::::::
Detmolder Str. 25-33 :: D-33604 Bielefeld
fon +49.521.96878-0 :: fax  +49.521.96878-20
http://www.ammma.de
::::::::::::::::::::::::::::::::::::::::::::::