idea bouncing: using cvs as a replacement for mergemaster

[Daniel O'Connor]

On Thu, 29 Nov 2007, Kevin Oberman wrote:
> > It is a port - sysutils/etcmerge.
>
> Another simple solution, which needs more publicity, is 'mergemaster
> -U'. I do my updates using -Ui and seldom have to deal any manual
> merge. It's not perfect as I still need to deal with locally modified
> files, but "it's good enough".

The beauty of etcmerge is that only conflicting changes are a problem 
and they are quite rare.

It does require a refence copy the first time you run it but that is 
easily obtained by running mergemaster once, after that it updates it 
automatically.

-- 
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 Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20071128/8482ae85/attachment.pgp