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

Re: Compare URLs allows editing

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 09 Feb 2011 20:10:31 +0100

On 09.02.2011 19:10, Jean-Marc van Leerdam wrote:
> He can edit the file in the right pane of TMerge

In that case:
TortoiseMerge always allows editing. Even if it was started showing
diffs of temp files as in this case. The reason is very simple: you can
save the result anywhere you want. There's no reason to actually prevent
a user from editing a file.

As for the removed lines: the star doesn't show up on the left side
because that file isn't modified at all. Its view just has to change to
match the right view - removed lines have to get removed on the left
too, otherwise the views wouldn't match anymore.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2703087
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-09 20:10:48 CET

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.