RE: Re: RFE #876613

"kaczoroj" wrote:

> This is just to reserve the description text for the state where
> there is a conflict and the file was touched. It doesn't neccesarily 
> conflict with your other approach to allow users to "mark" files as 
> "Resolving"

Erm,... that sounds actually quite like the reverse of what I was
proposing... I was proposing to have the automatically generated State
description text read "Resolving" in order to express that the manual
resolution process /might/ still be unfinished. The other part which
you mixed in here is my "Mark Resolved" macro (which is already done)
which could then be used to consciously "tick off" all files of which
you are sure are completely resolved as such.


> but that is a topic that I will come back to when doing 
> the actual resolved conflict state detection (which we will not have 
> just yet).

OK. Read you later.

Cheers,

-- 
Oliver
----  ------------------
JID:  [email protected]
ICQ:  18777742	(http://wwp.icq.com/18777742)


 

------------------------ Yahoo! Groups Sponsor ---------------------~-->
Buy Ink Cartridges or Refill Kits for your HP, Epson, Canon or Lexmark
Printer at MyInks.com. Free s/h on orders $50 or more to the US & Canada.
http://www.c1tracking.com/l.asp?cid=5511
http://us.click.yahoo.com/mOAaAA/3exGAA/qnsNAA/NhFolB/TM
---------------------------------------------------------------------~->

Yahoo! Groups Links

To visit your group on the web, go to:
 http://groups.yahoo.com/group/cvsgui-dev/

To unsubscribe from this group, send an email to:
 [email protected]

Your use of Yahoo! Groups is subject to:
 http://docs.yahoo.com/info/terms/