RFC: Two new macros.

Hi all!

While helping our documentation writer resolve conflicts that were 
created by accidentally working with two copies of a sandbox folder and 
alternately committing from both of them, I wrote another little macro 
that I thought might be worth including in our bundle.

The problem it addresses is that of files that were, as CVS puts it, 
"added independently by a second-party", i.e. files that are currently 
in an unknown state in your sandbox but that already exist in the 
repository. What the macro does is this:

In order to allow diffing the local file against the repository file,
- it temporarily renames the local file,
- checks out the repository file (to get the Entries info) then
- deletes the checked out file and finally
- renames the local file back to its old name.

The effect is that now you have a committable file in your sandbox which 
you could compare to the repository revision right from within the GUI 
using the Diff command.

I am rather unsatisifed with its current name though and while this is 
purely cosmetical I still think this should be resolved before including 
it in the distribution. It's current name is "Override second-party add" 
and it is located in a sub-menu called "Problem Resolution". Any ideas 
for something more snappy? ;)
Do you think this is worth including?

===

Then, while I'm at it, I've got another macro "lying around" that I 
wrote some time ago, mostly as a proof of concept for reading WinCvs 
preferences from within macros: It allows to invoke the External Diff 
application on any arbitrary selection of two files or folders. The main 
reason that I haven't committed it yet is that originally I had been 
intending to also allow external diffing of _revisions_ of arbitrary 
files which is something I haven't got time to finish at the moment 
(don't even know if the required update -p could be made to work 
reliably from within a macro).

It has actually cost me quite a bit of sweat to get this to work 
properly even though the problems eventually turned out not to be in the 
macro itself but in the Diff application I used which is also a tool 
written by me (a proxy to call other differs based on file type). Still, 
I'd welcome it if people could testdrive it with various Diff 
applications before we put this in. AFAICT the main difference to the 
way WinCvs calls the Diff app is that it does not convert long or spaced 
paths to 8.3 notation but quotes them instead.


I have uploaded the two macros to the file area for review awaiting your 
comments... ;)

Cheers,

Oliver
------
In everybody's best interest, please do not post or CC technical 
questions to me in private unless they are specifically about a 
macro/product of mine that is NOT already bundled with WinCvs. I will 
generally forward my replies to such posts to the CVSGUI list without 
further notice.
----	------------------
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/