From mboxrd@z Thu Jan  1 00:00:00 1970
Message-ID: <055d170589876fa7a5e9cbc3c77c1954@quintile.net>
From: "Steve Simon" <steve@quintile.net>
Date: Wed,  6 Oct 2010 09:33:44 +0100
To: 9fans@9fans.net
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: Quoted-Printable
Subject: [9fans] diff3 for c source
Topicbox-Message-UUID: 5f5c84fe-ead6-11e9-9d60-3106f5b1d025

Anyone know of a tool that works like diff3 but has a fairly deep
knowledge of C cyntax, so it can merge changes at the C token level rathe=
r
than at the line level?

The problem I am trying to solve is keeping the (say) 9vx source in sync =
with
the plan9 kernel.

alternatively anyone known know of somthing which might be able to modify
the plan9 source to make it acceptable to gcc

	=E2=80=A2 adding names for unused function parameters
	=E2=80=A2 adding names for blind structure members
	=E2=80=A2 adding apropriate names for "auto structure member selection b=
ased on type"

the ed technique russ used is neat, and diff3 (v7 diff3 in my contrib) co=
uld do a
little better, but a real solution still eludes me.

-Steve