Re: merging of C code

Mathias Hoffmann написа:
> 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
Hi,

In my opinion, this is not up to Subversion at all. This is up
the project management. If Sally has been got to check
the module where this loop resides, others people in the team
should work somewhat else....

-- 
Regards,
Ivan Cenov
OKTO-7 Co., Botevgrad, Bulgaria
i_cenov@botevgrad.com, imc@okto7.com
  GSM: +359 888 76 10 80
phone: +359 723 6 61 20, +359 723 6 61 61
  fax: +359 723 6 62 62
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org