[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: Todd C. Gleason <tgleason_at_impac.com>
Date: Wed, 13 May 2009 10:11:08 -0700

> -----Original Message-----
> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
> Sent: Wednesday, May 13, 2009 10:09 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: conflicted directory
> 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.

I'm not sure whether this is a good idea, but you could have the Edit Conflicts option be present, but instead of having it launch the diff tool, it would just open an explanatory dialog window containing:

1. Information that it's a tree conflict, a description of what this means, and possible reasons why you got into a tree conflict
2. Offer to resolve from this dialog
3. Cite the source of the merge (by following mergeinfo) as a location to compare against *
4. Offer to directly compare the conflicted URLs against the merge source

This may be an almost wizard-like amount of guidance, but tree conflicts can be very confusing because it's not always obvious why you got one.

Alternately instead of "Edit conflicts" you could name it something like "Help with conflicts...", "Tree conflict help...", or some such.

* I also realize that steps 3 and 4 may be tricky because if you do multiple merges it may not be obvious which set of new mergeinfo is involved.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-13 19:16:49 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.