merging of C code

Hello,

how to solve the problem, described below:

Let's say Harry amd Sally have the same working copy of a C source file:

        for(;i<10;)
        {
          foo();
          bar();
        }

Now, sally detects a missing loop counter inc.

        for(;i<10;)
        {
          foo();
          bar();
          i++;
        }
Sally commits her changes.

Harry checks his source code and he fixes the same bug - just at the
beginning of the loop ...

        for(;i<10;)
        {
          i++;
          foo();
          bar();
        }

He updates his working copy and commits his changes.

The result is:
        for(;i<10;)
        {
          i++;
          foo();
          bar();
          i++;
        }

Is there any solution for this problem (for example existing customized
diff-scripts for c-code)?

Regards,
Mathias

----------------------------------------------------------------------------
--------
Freyer & Siegel
Neuendorfstr. 18b
16761 Hennigsdorf
Tel.: +49 3302 79 121 - 0
Fax: +49 3302 79 121 - 11
Web: http://www.freyersiegel.de
Mail: mathias.hoffmann@freyersiegel.de
----------------------------------------------------------------------------
--------
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon May 14 14:03:18 2007