Date: Fri, 13 May 2005 18:15:10 +0200 From: John Hay <jhay@icomtek.csir.co.za> To: "Daniel O'Connor" <doconnor@gsoft.com.au> Cc: "Matthew D. Fuller" <fullermd@over-yonder.net> Subject: Re: mergemaster improvement (auto-update for not modified files) Message-ID: <20050513161510.GA97948@zibbi.icomtek.csir.co.za> In-Reply-To: <428535F5.3060604@gsoft.com.au> References: <427743ED.6020200@FreeBSD.org> <4284680E.1060008@FreeBSD.org> <20050513101554.GA1519@over-yonder.net> <428535F5.3060604@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
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@icomtek.csir.co.za / jhay@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050513161510.GA97948>