Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 May 2005 08:49:17 +0930
From:      "Daniel O'Connor" <doconnor@gsoft.com.au>
To:        "Matthew D. Fuller" <fullermd@over-yonder.net>
Cc:        Denis Peplin <den@freebsd.org>
Subject:   Re: mergemaster improvement (auto-update for not modified files)
Message-ID:  <428535F5.3060604@gsoft.com.au>
In-Reply-To: <20050513101554.GA1519@over-yonder.net>
References:  <427743ED.6020200@FreeBSD.org> <4284680E.1060008@FreeBSD.org> <20050513101554.GA1519@over-yonder.net>

next in thread | previous in thread | raw e-mail | index | archive | help
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 :)

-- 
Daniel O'Connor software and network engineer
for Genesis Software - http://www.gsoft.com.au
"The nice thing about standards is that there
are so many of them to choose from."
   -- Andrew Tanenbaum
GPG Key ID - 7B3FCE8C



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?428535F5.3060604>