Re: WinCvs install script and MarkResolved macro

> OK, I'll commit as soon as I've got the two new macros ready, so I won't
> have to commit twice... ;)

All done now as you might have noticed. The readme at
http://people.freenet.de/ogiesen/readme.html is also already updated. Now I
really got to transform that doc into something that could be bundled with
the release or at least be integrated with the website... I guess I should
add similar short descriptions for the other macros (those not written by
me) as well then... at least the Python ones...


> I'm actually
> still thinking of removing the recursive mechanism, so as to make it an
> even more conscious action: only explicitly selected files will be
> marked as resolved - in that case I could probably skip the
> marker-scanning indeed.

FYI: I decided to keep the recursion (for now...). However, the macro itself
contains a note that it is recommended to run "Locate conflicts" (see below)
first, before running this on a directory selection, i.e. recursively. This
would be another warning message destined to be implemented as a "Don't show
again" popup.


> > - 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.
>
> Good idea. I'll add that. It could actually be handled by the same macro
> (or at least the same base class). It would basically be a "simulated"
> run of the macro I have now with slightly reworded reports. Do you think
> that version of the macro should scan files that are not reported as
> having conflicts (by the Entries API) as well?

That macro is now registered as "Macros|Search|Locate conflicts" and will
scan all CVS-controlled files, regardless of whether they're indicated as
conflict or not - it will only report files without conflicts however if
they are currently in Conflict status, i.e. when they are possibly
resolved - these are the files that would be marked by the "Mark as
Resolved" macro..

The macros so far work as expected in all use cases I tested, however I am a
bit uneasy putting this into the hands of users who probably won't even read
the warnings in the docstring... OTOH a warning alertbox that will pop up
_every_ time is a bit too obstrusive for those who know what they're doing
IMO... hmm, I vote for not moving the release tag forward to these two until
a proper solution has been found for this (note to self: this would also
mean removing them again from the installer script as well...). Opinions?

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

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/