.origin patch

[Stephen Rasku]

I was asked to look at Steve Cameron's .origin patch a few months ago. 
 I have had it installed for about 4 months now and none of my 
developers have complained about anything being broken. 

Today, I did a merge using the .origin feature.  My original merge was

        cvs update -kk -j branch
        
which generated a lot of spurious differences.  I then did:

        cvs update -kk -j branch.origin -j branch
        
and it generated a much cleaner tree.  I only had one conflict to 
resolve.

This is (obviously) not an exhaustive test -- and I don't really have 
time to do one -- but it is encouraging nontheless.

-- 
Stephen Rasku                   E-mail: stephen@tgivan.com
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies