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

Re: [TSVN] Missing cancel button in TMerge dialog?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-08-03 18:06:33 CEST

Jan Normann Nielsen wrote:

> To reproduce my problem: Choose "Resolve conflicts" a file with at least
> two conflicts in it. Resolve only one of them and close TMerge. It asks
> if I want to save the file. Choose yes. A warning is shown that the file
> still contains conflicts. From this dialog, TMerge closes regardless of
> whether I choose yes or no. There is no way to return to TSVN without
> saving. I need a cancel option or have the "no" button return to TMerge.

Fixed in revision 4055.

> By the way, in the "check for modifications", isn't the most logical
> function of double-clicking a file with conflicts to resolve the
> conflicts instead of just diff'ing?

Not really. People wanted to have the doubleclick always do the same
thing (diffing). Also, some people like to see the conflict markers.


   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 Wed Aug 3 18:07:10 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.