From mboxrd@z Thu Jan  1 00:00:00 1970
To: 9fans@cse.psu.edu
From: steve.simon@snellwilcox.com
Message-Id: <3894767811@snellwilcox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Id: <3894767811-1@snellwilcox.com>
Content-Transfer-Encoding: 7bit
Subject: [9fans] OT -  CVS-like merge for dumpfs / relica with sources
Date: Tue, 26 Nov 2002 12:08:12 +0000
Topicbox-Message-UUID: 27f7d4ba-eacb-11e9-9e20-41e7f4b1d025

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