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

Re: [TSVN] don't close Update by ESC if conflicts?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-03-27 11:37:49 CEST

Fernando P. Nájera Cano wrote:

> S> You won't loose the information about a conflict even if you close
> S> the dialog by accident. The files will still be in a conflicted
> S> state and show the conflicted overlay.
>
> ... if you're using overlays. If not, you'll have to travel across
> 150+ folders (in my wc) looking for .rxxx, .rxxx+1, .yours, etc.; or
> you'll have to go to Check for Modifications.
>
> But you'll lose information about merged's, you cannot recover that
> information anymore. And merged's are important - at least for me, as
> the way SVN merges is not always the best way to merge...

You can set the conditions on which the progress dialog closes
automatically after the operation is finished. If you there specify
"Auto-close if no merges, adds or deletes" then the dialog will only
close automatically if there's really nothing 'important' to see.

Stefan

-- 
        ___
   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 Sun Mar 27 11:38:22 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.