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

[TSVN] Possible TortoiseMerge bug

From: Lauri Kotilainen <rytmis_at_gmail.com>
Date: 2005-09-12 13:45:00 CEST


I just observed a colleague who updated a file and promptly got a
conflict (so far, so good, it was expected). When he opened the
conflict editor, there was a conflict marked in a spot that didn't, in
fact, conflict (a peek at the file that contains the markers confirmed
this, those lines were properly merged). After setting the "ignore
whitespace" setting *off*, the editor displayed a conflict in the
correct place.

I'm not allowed to post the code listings, so I'll just have to ask if
anyone has encountered this before.

Thanks for your time,


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 12 13:45:45 2005

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