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

RE: conflicted directory

From: Bolstridge, Andrew <andy.bolstridge_at_intergraph.com>
Date: Thu, 14 May 2009 10:30:51 +0100

> -----Original Message-----
> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
> Sent: Wednesday, May 13, 2009 5:09 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: conflicted directory
>
> Bolstridge, Andrew wrote:
> > Hi.
> >
[snip]
> > What confused me is that for conflicted files, I have to edit
> > and then resolve them; for a directory I have to go straight to the
> > resolved command which allows me to ‘edit’ the conflicts. That didn’t
> > seem to be best practice for usability. Is there a reason its done
> > this way, or do you think there should there be an ‘edit conflicts’
> > menu item for conflicted directories?
>
> "edit conflicts" is to edit conflicts in text files (you can edit text
> files). But you can't edit a tree conflict (how would you edit a
> folder?). That's why the menu items are named differently and also
> behave differently.
> The only thing you can do with tree conflicts is to resolve them (most
> of those tree conflicts have to be resolved manually since TSVN has no
> way of helping you with this) and then mark them as resolved.
>
> But I'm open for suggestions on how to improve this.
>

Sure, I understand you cannot actually resolve the tree conflict, but then neither can you do that with a binary file, and the edit conflicts item still appears (IIRC). You don’t get much choice (use theirs or use mine) but the same workflow is available to resolve them. I'd expect 'edit conflicts' on a directory to pop the same dialog as resolve does to show you the affected files.

Perhaps the whole edit/resolve conflicts needs some change - instead of editing them and then marking them as resolved, this should be a single operation?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2253655

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-14 11:33:23 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.