[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: Nicklas Norling <exinor_at_exinor.net>
Date: 2005-04-14 21:19:25 CEST

Amir Kolsky wrote:

> I must be doing something wrong here...
> Either my suggestions are increadibly stupid.
> Or they are already there, and I haven't noticed.
> Or I'm being ignored...
> Can someone from the developers please repsond? Is there a better
> place to place these suggestions?

It's just a very confusing email, that's all. Not exactly sure what
you're asking, but it's not stopping me...

> Amir Kolsky
> XP& Software
> ------------------------------------------------------------------------
> *From:* Amir Kolsky [mailto:amir@xpandsoft.com]
> *Sent:* Thursday, April 14, 2005 8:52 AM
> *To:* dev@tortoisesvn.tigris.org
> *Subject:* [TSVN] Suggestion: Keep the Update dialog open in case
> of Conflicted files
> 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)
> 2. Resolve conflicts
> 3. Use update copy (in effect: delete and reUpdate).
> 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').
What are the suggestions?
The resolution of conflicts after a update is inherited from subversion
and is nothing TSVN can do
anything about. What exactly is the problem? You should use resolve
conflict independant of the
file typ (binary or text) or you will loose the changes done in
previously committed revisions.

> 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
> 5. Move
> 6. Rename.
> Finally, it would be very useful to have an Open Containing
> Workspace (Folder) option that will allow me to directly reach the
> affected files.
> Amir Kolsky
> XP& Software
If update deletes files then it's already to late to do anything. The
change has already been permanented
in the repo (and possibly everyone elses WC). Use your diff/merge tools
to move over your changes.
Team communications is also a good thing here. Maybe you shouldn't have
ppl coding in places where
a reorg is pending.

What is a open containing workspace? It sounds to me you are refering to
windows explorer (which
already exists).

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Apr 14 21:19:41 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.