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

Re: Tree conflicts help

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 21 Feb 2009 19:01:51 +0100

Simon Large wrote:
> Hi Stefan,
>
> I have started work on the tree conflicts and updated case 1. I have
> tried to include the deleted file and deleted folder cases as well as
> rename. They are all part of case 1, but trying to cover them all
> together makes for a more complicated description. But I prefer that
> to splitting into 1001 cases :-/

Looks good. You're doing a much better job with the docs than me :)

> Can you read it and see if it makes sense.
>
> I have added the link back to the help button in the conflict editor.
> It would be nice if the conflict editor could jump to the appropriate
> use case in the help dialog, but not sure of that is possible on the
> fly.
>
> Should the conflict editor have a help button?

I'll add a help button soon. I will also add some more info to the
dialog (conflict source and destination urls).

Stefan

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

Received on 2009-02-21 19:02:10 CET

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.