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

Re: names of conflicted files breaks Windoze ability to deal with files

From: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2006-05-26 23:37:43 CEST

Donald H Locker wrote:
> 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?

There was some discussion a while ago on the Subversion mailing list
about changing the names of these conflicted files so instead of the
format file.ext.123 it will be file.123.ext. This should resolve your

Someone else would have to confirm if this was actually committed, or is
in the 1.4.x branch, however.


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:35:29 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.