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

Resolve using theirs with Read-only file fails silently

From: Donald H Locker <donald.locker_at_ptmelec.com>
Date: 2007-10-18 13:24:52 CEST

TortoiseSVN 1.4.5.10425, Windoze 2k and XP
Merging a binary file leaves file conflicted. (This I expect)

If destination file is read-write, selecting "Resolve conflict using theirs"
succeeds as expected. Conflict is resolved and "theirs" replaced "mine."

If destination file is read-only, selecting "Resolve conflict using theirs"
leaves original file in place, still read-only, with no indication that
anything unusual happened. 

-- 
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 Thu Oct 18 14:11:56 2007

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.