Re: OT - CVS-like merge for dumpfs / relica with sources

> Any ideas on a script to do a CVS like merge of two
> incompatable versions (overlapping changes)
> of a file in the dump filesystem.

i use the gnu version of diff3, and a little script called "merge"
(which i've attached).

then when i've made changes on my home laptop that
i want to merge in with the current source, i use (e.g.)

        merge -n 5 /n/kfs/usr/rog/xx/*.c /usr/rog/xx

the options are exactly those taken by yesterday(1).

you have to be a little careful, as merging is not idempotent.
(but conflicts are flagged, so it's not too bad).

nigel@xxxxxxx did the diff3 port and suggested how to use it.
i think he's got the port.

  cheers,
    rog.

merge
Description: Text document