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

Re: [TSVN] Suggestion: Keep the Update dialog open in case of Conflicted files

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-04-14 22:39:47 CEST

Amir Kolsky wrote:
> I must be doing something wrong here...

Just a little, not much ;)

> Either my suggestions are increadibly stupid.

Not stupid, but it's hard to understand them.

> Or they are already there, and I haven't noticed.
> Or I'm being ignored...

Since there are so many mails on this list, I usually only answer those
which I think I can answer best. But most mails can be answered by many
other people on this list too, so I leave those to them - after all, I
have to work on TSVN...

> *Subject:* [TSVN] Suggestion: Keep the Update dialog open in case of
> Conflicted files

The progress dialog already stays open. If it closes for you
automatically, then check your settings, the main tab.

> Wait, that's not all. Once you click on a conflicted file you will
> be given the options to:
> 1. Edit conflicts (using the usual tools)

Already there.

> 2. Resolve conflicts

Resolve conflict would mark the file which is in conflict as resolved,
but wouldn't resolve the conflict itself. And that's something really
nobody wants! That file has the conflict markers inserted by Subversion
and is therefore 'corrupt'.

> 3. Use update copy (in effect: delete and reUpdate).

Use "edit conflicts", right-click in TMerge, choose "use whole file", save.

> I find it the most convenient to deal with problems in a
> concentrated fashion. These suggestions would let me deal
> effectively with the two types of conflicts: Text (via the edit and
> resolve) and Binary (via the 'use updated copy').
> If a file or directory or something should have been erased by the
> update but were not (because they were updated since the previous
> update) allow me to
> 4. Delete

Deleting a file? Without you having checked (opened that file first) if
it's important?

> 5. Move

To where? Moving files is really something you should use the explorer
for, not TSVN.

> 6. Rename.

That too, you can do that with the explorer much better.

> Finally, it would be very useful to have an Open Containing
> Workspace (Folder) option that will allow me to directly reach the
> affected files.

Now *that* something I could do.


   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 Thu Apr 14 22:40:30 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.