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

Re: Issue 187

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-11-14 14:01:56 CET

Stefan Küng wrote:
> On 11/14/05, Simon Large <simon@skirridsystems.co.uk> wrote:
>
>>>Simon: Since there's no easy/reliable way for TortoiseMerge to know if
>>>a file is BASE (or that a file shouldn't be modified at all) should we
>>>close this issue as WONTFIX?
>>
>>BASE files are actually read-only, so TMerge could refuse to attempt
>>changes to such a file. Another can of worms - should it attempt to
>>detect SVN temp files too, and avoid changing them? When you diff
>>against an old revision, you get exactly that. Maybe TortoiseProc should
>>make those retrieved old-revision files read-only before calling TMerge.
>
> You can't. The user can still decide to make changes and then use "save as...".
> And "Save" is disabled in that case (file being readonly).
>
>>There are 2 reasons cited for switching panes:
>>
>>1. Because in a 2-way diff of arbitrary files, Windows gives them in
>>whatever order it feels like. In this case, always saving the right pane
>>works well.
>>
>>2. Because the user prefers to see the WC file in the left pane. This is
>>OK for diffing, but doesn't fit at all well when making changes, where
>>you always assume the changes are going into the right pane. If it is
>>supported at all it should be a separate option ('Working file in left
>>pane') in TMerge settings, rather than an on-the-fly change from the
>>toolbar.
>
> As mentioned on the mailing list: that would require to have the left
> pane editable too. I don't think that's worth the effort.
>
>>Would it be clearer that the right pane is the destination of all
>>changes if the left pane had no context menu and the right pane had 'Use
>>this' *and* 'use other' (and maybe 'this before other and 'other before
>>this')?
>
> Then people would wonder why they can't edit the changes. If you
> remember: we had that in the beginning of TMerge. But people insisted
> that there should be a context menu on the left view.

OK, that all sounds fair to me. The fix has to be in the doc ... coming
soon.

> P.S.
> It would be better if you add such comments directly to the issue
> instead of replying to the notice mail.

OK. The only reason I did that was because I thought discussion in the
issue tracker was discouraged.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Nov 14 14:07:32 2005

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

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