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

Re: Resolve using theirs with Read-only file fails silently

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-12 18:44:22 CET

Donald H Locker wrote:
> I haven't seen any responses to this query and wonder if maybe it's just
> me. I don't mind the failing, of course, it's the silence that bothers me.
>
> Thanks again,
> Donald.
>
> 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.

This should work correctly in the latest nightly build from trunk.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Nov 12 18:45:00 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.