Re: merging of C code

On 14/05/07, Mathias Hoffmann <mathias.hoffmann@freyersiegel.de> wrote:
> 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)?

I have seen this code somewhere else, possibly on subversion's own
site, and I think it is a well-known limitation of the merge method.
As to whether there is any solution, I think you need to ask that on
the users at subversion.tigris.org mailing list. I suspect the answer
is no, otherwise it would already be implemented.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org