Re: [TSVN] Resolving Conflicts

>> But I CANNOT figure out how to merge to conflicting
>> versions!
(snip)
>That menu entry is only available if you right-click on a file which has
>the Subversion status "conflicted".
(snip)

>Again, this menu entry is too only available for "conflicted" files.
(snip)

Just for discussion and thought...

This is one of the things I utterly despise about the Mac - the constant
changing of menus...

I have a tendency to learn where things are, and I get confused when they're not
there. (uh, right now I can't find the leash for the dog... :)

I greatly prefer things be greyed out - but even more so, *tell me WHY* I can't
do that right now.

So (when I become King...) the menu would show "Edit Conflict" but be grey (or
otherwise visually modified as to be "not valid right now") and when I click on
it anyway it would pop up a dialog saying "This is to merge files when there is
a conflict between the repository version and your baseline. You do not have
such a conflict with file Foo.C"

(side comment... My reaction to my own words is: "ok, so *you* (meaning me)
go code it up and submit it"
Valid, and to be honest one of the first things I did was to download the
sources to start making changes (add some features that I wanted...) - but if I
read things right, I can't build TSVN with MSVC 6; I need the newer .NET tools.
I'll ask questions about building TortoiseSVN in a new thread, so it'll be
easier for others to find too.)

- Al -
(who still needs to upgrade to 1.0.8... :)

-- 
--  Alan Weiner  --  alan_at_ajw.com  --  http://www.ajw.com
Palm OS Certified Developer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org