mergemaster improvement (auto-update for not modified files)

John Hay jhay at icomtek.csir.co.za
Fri May 13 09:15:43 PDT 2005


On Sat, May 14, 2005 at 08:49:17AM +0930, Daniel O'Connor wrote:
> Matthew D. Fuller wrote:
> >One thing that I'm pretty sure has been brought up before would be
> >that, for those of us who keep a local CVS repo mirror, it's easy and
> >pretty cheap to check out even arbitrary revs to compare to what's
> >currently there (and if you wanted to be REALLY overly-smart, you
> >could even try automagically merging local changes ;)
> 
> etcmerge can already do this :)

Maybe, but last time I tried to use it, I got the feeling that it was
missing a front end. If its cleverness could be married to the ease
of use of mergemaster, we would have a winner. IMVHO

John
-- 
John Hay -- John.Hay at icomtek.csir.co.za / jhay at FreeBSD.org


More information about the freebsd-hackers mailing list