From mboxrd@z Thu Jan  1 00:00:00 1970
From: andrey mirtchovski <andrey@lanl.gov>
To: 9fans@cse.psu.edu
Subject: Re: [9fans] OT -  CVS-like merge for dumpfs / relica with sources
In-Reply-To: <3894767811@snellwilcox.com>
Message-ID: <20021126085452.N25804-100000@fbsd.acl.lanl.gov>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Date: Tue, 26 Nov 2002 08:55:28 -0700
Topicbox-Message-UUID: 28344314-eacb-11e9-9e20-41e7f4b1d025

dpx@lanl ported patch and diffutils to P9:

http://www.acl.lanl.gov/plan9/unix/patch-2.5.4.tar
http://www.acl.lanl.gov/plan9/unix/diffutils-2.7.tar

the downloads are rather big, though...

hope that helps, andrey


On Tue, 26 Nov 2002 steve.simon@snellwilcox.com wrote:

> Hi,
>
> 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 assume this is fairly easy using just diff/awk/sed etc
> but I cannot see how to do it...
>
> This would also be handy when doing a replica only to discover that
> "the labs" (tm) has fixed parts of a file you are also working on and you
> want to merge their changes with yours...
>
> -Steve
>