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

Re: Bug in merge (repro included)

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2005-02-04 07:50:04 CET

HI!

"Sander Striker" <striker@apache.org> wrote in message
news:25908.8096012876$1107451820@news.gmane.org...

> GNU diff3 is not the same as Subversion. The results may differ.
> I don't feel it is wrong per se.

IMHO, the diff between B1 and B2 can be seen in 2 different ways:

1. Respecting whitespaces (see the unified diff)
There you can see the removal of one big block and the addition of another
big block.

2. Ignoring whitespaces
There you can see, what really was done: Moving one "}" to another line and
adjusting the indentation accordingly.

AFAIK, svn merge does not ignore whitespaces. But then it has not only to
add the new block, but also to remove the obsolete block. But svn merge just
does the add, not the remove. If it would have tried to remove the big
block, it would have resulted in a conflict, because that block is slightly
different in T and so cannot be removed.

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Feb 4 08:02:54 2005

This is an archived mail posted to the Subversion Dev mailing list.