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

names of conflicted files breaks Windoze ability to deal with files

From: Donald H Locker <donald.locker_at_ptmelec.com>
Date: 2006-05-26 23:21:43 CEST

I have a number of Access databases (.mdb) which are maintained under
subversion with TortoiseSVN.

When I update, and there are conflicts, I get the three magically named
files blah.mdb blah.mdb.r666 and blah.mdb.r42 Unfortunately, the
Tortoise external comparator doesn't recognise blah.mdb.r666 and
blah.mdb.r42 as .mdb files anymore and attempts to compare them as text.
  Of course this doesn't work.

Could TortoiseSVN recongise that both files are really of the "type"
.mdb and use my external comparator?

What I have been doing is copying my file to blah.mine.mdb, choosing
"resolve conflict using theirs" then comparing the various pieces.

I just experimented and if I hilight the .rxx file first, then the .mdb
file, TortoiseSVN diff uses my external comparator just fine; hilighting
.mdb first, then .rxx TortoiseSVN tries to do a text comparison. Looks
like the "type" of the last-selected file determines the comparison
strategy.

TIA,

-- 
Donald H Locker
PTM Electronics, Inc
734 426 9010
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri May 26 23:24:27 2006

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