From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.4 X-Google-Thread: 103376,e3649276d0ec8d18 X-Google-Attributes: gid103376,public,usenet X-Google-Language: ENGLISH,ASCII-7-bit Path: g2news2.google.com!news2.google.com!border1.nntp.dca.giganews.com!border2.nntp.dca.giganews.com!nntp.giganews.com!uns-out.usenetserver.com!news.usenetserver.com!pc02.usenetserver.com!news.flashnewsgroups.com-b7.4zTQh5tI3A!not-for-mail Newsgroups: comp.lang.ada Subject: Re: Merging Ada Files References: <1189562448.148837.261350@r29g2000hsg.googlegroups.com> From: Stephen Leake Date: Wed, 12 Sep 2007 08:33:16 -0400 Message-ID: User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/22.1 (windows-nt) Cancel-Lock: sha1:FoQOi1SeiPaFbFb72w0xwZiRdq0= MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Complaints-To: abuse@flashnewsgroups.com Organization: FlashNewsgroups.com X-Trace: 57e8346e7dc90e05e48ed24451 X-Original-Bytes: 1367 Xref: g2news2.google.com comp.lang.ada:1907 Date: 2007-09-12T08:33:16-04:00 List-Id: prichtmyer@yahoo.com writes: > 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. Gnu diff3 does this nicely, and is available in Cygwin for Windows. -- -- Stephe