From: prichtmyer@yahoo.com
Subject: Merging Ada Files
Date: Tue, 11 Sep 2007 19:00:48 -0700
Date: 2007-09-11T19:00:48-07:00 [thread overview]
Message-ID: <1189562448.148837.261350@r29g2000hsg.googlegroups.com> (raw)
We have two versions of an Ada system, both derived/evolved from an
older version. For each Ada file where there are differences in the 2
versions, I would like to make a complete file merge where the output
file identifies (somehow) those lines of code that were only in
version A (if any), and those lines that were only in version B (if
any), as well as possible conflicts. Does anyone know of a tool or way
to accomplish this? Platform can be either MS Windows or Sun - Unix.
Thanks.
next reply other threads:[~2007-09-12 2:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-12 2:00 prichtmyer [this message]
2007-09-12 4:01 ` Merging Ada Files Per Sandberg
2007-09-12 8:07 ` Tomek Wa kuski
2007-09-12 12:33 ` Stephen Leake
2007-09-12 20:56 ` Simon Wright
2007-09-13 3:48 ` Steve
replies disabled
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox