[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 13 May 2009 18:09:02 +0200

Bolstridge, Andrew wrote:
> Hi.
>
> I’ve just had my first “tree conflict” when merging in SVN, I
> had deleted some files from a previous revision that weren’t present
> when I merged so svn decided to tell me about them. I also had a few
> other conflicts which I resolved.
>
> No problem there – except I saw my directory had the little red
> triangle on it for the conflict and it wouldn’t go away – usually I take
> the icon with a small pinch of salt as they sometimes don’t refresh as
> quickly as I’d like, and I thought this was the problem. However, not in
> this case – the missing files were causing my directory to require a
> conflict resolution.
>
> So, I right-clicked and looked for the ‘edit conflicts’ menu
> item, which doesn’t exist. At this point I was a bit stumped as to what
> to do, in the end I decided to just mark the directory as resolved, and
> sort it out later – so I selected the ‘resolved’ menu item, and it
> presented me with a little dialog of missing files that allowed me to
> tell it those files were correctly missing.
>
> 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.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2239695
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-13 18:09:53 CEST

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