[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging of C code

From: Roel Harbers <roel_at_roelharbers.com>
Date: 2007-05-14 15:20:50 CEST

Mathias Hoffmann wrote:
> 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)?

In this particular case, I'd suggest you make sure all your developers
adhere to the same, unambiguous coding style, so they'd fix it in the
same spot (putting it in the for statement comes to mind :P )

Alternatively, you could let every merge fail, by setting /usr/bin/false
or similar as the diff3-cmd (there's probably a false.exe available
somewhere, or you could make your own: just write an empty program that
returns 1), and manually merge all conflicted files.

Trying to create a 3diff command that detects this sort of thing is
going to prove very hard: what if incompatible changes are made in
different documents? There are simply too many edge cases to take into


Roel Harbers

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

This is an archived mail posted to the TortoiseSVN Users mailing list.