WinCvs install script and MarkResolved macro

Oliver,

>I started playing around a bit with the install script, trying your
>idea of creating an unselected component for "obsolete macros".
>(snip)
>If you want I could commit the macro stuff already.

Sure, why not - when it comes to macros *you* are definately in charge ;)

>I was also thinking if it might be possible to create an alternative
>installer that excludes the CVSNT files, but instead offers to either
>specify their location (but then where do I put it (...)-

I was already thinking about that. We can have "bare" WinCvs install without
any CVSNT files and we don't really have to worry about specifying the
location of CVSNT all that much because WinCvs preferences offers the
setting for that already.

All we really need is the way to direct the user to properly set the
"Alternative CVS executable". We can do that in the install script but I
think it's easier and better to add the check in the WinCvs itself and at
the start simply check whether the CVS executable is present and either
print the warning message or perhaps even open the preferences with the
cursor nicely blinking in the right place ;)

>or alternatively downloads the latest installer on demand
>via ISTool's Download DLL

It seems to be an overkill - the "bare" install would be directed at the
people who know what they are doing and who understand that they have to
download CVSNT separately. The warning at the start of WinCvs should
eliminate that from becoming a new FAQ ;)

>> What exactly does the MarkResolved suppose to do?
>You'd probably say it's just cosmetics... ;)

It looks like it's more than that actually.

>It recursively scans the selection for Conflict files that have
>been modified since the conflict occured and that do not
>contain any conflict markers.

I would skip the scanning for conflict markers - it's entirely possible that
file contains a legitimate content that looks like markers. The timestamp
comparison against the file modification time should be enought. And much
faster too.

Please keep in mind that the macro will end up in "obsolete macros"
eventually because we ought to incorporate the resolved conflicts indication
into GUI itself.

On the second thought - in case you got some code on that already - the
scanning for conflict markers isn't such a bad idea. It may be quite usefull
to have the macro scanning for these and reporting the files containg them
but without the modifications to entries file. It could be called "Search
CVS Conflict markers" or something similiar.

Best Regards,
Jerzy


------------------------ 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
---------------------------------------------------------------------~->

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/