Keyword substitution during update

[Martin Apel]

Hi, all                                                                             
                                                                                    
I have a problem updating files in a branch containing keywords.                    
Those files contain something like:                                                 
                                                                                    
#    Version    :  $Revision: 1.10.4.1 $                                            
                                                                                    
before the update. Updating generates a conflict like the following:                
                                                                                    
<<<<<<< Rvr.make                                                                    
#    Version    :  $Revision: 1.10.4.1 $                                            
=======                                                                             
#    Version    :  $Revision: 1.12 $                                                
>>>>>>> 1.12                                                                        
                                                                                    
This happens for the keywords Id, Date and Revision. When updating                  
the whole branch this leads to endless conflicts, I have to resolve by hand.        
Does anybody know a way around this?                                                
                                                                                    
Martin                                                                              
----------------------------------------------------------------------------

    Martin Apel                         phone: ++49.6301.606.300
    Human Modeling                      fax:   ++49.6301.606.309
    TECMATH AG                          email: [EMAIL PROTECTED]
    Sauerwiesen 2
    67661 Kaiserslautern, Germany

----------------------------------------------------------------------------