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!news4.google.com!news.germany.com!newsfeed01.sul.t-online.de!t-online.de!news.csl-gmbh.net!feeder.news-service.com!feed.xsnews.nl!border-2.ams.xsnews.nl!216.196.110.149.MISMATCH!border2.nntp.ams.giganews.com!nntp.giganews.com!news.astraweb.com!border1.a.newsrouter.astraweb.com!hwmnpeer01.ams!news.highwinds-media.com!hw-filter.ams!newsfet01.ams.POSTED!40385e62!not-for-mail From: Per Sandberg User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 Newsgroups: comp.lang.ada Subject: Re: Merging Ada Files References: <1189562448.148837.261350@r29g2000hsg.googlegroups.com> In-Reply-To: <1189562448.148837.261350@r29g2000hsg.googlegroups.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Message-ID: X-Complaints-To: abuse@WWWSpace.NET NNTP-Posting-Date: Wed, 12 Sep 2007 00:00:28 EDT Date: Wed, 12 Sep 2007 06:01:17 +0200 Xref: g2news2.google.com comp.lang.ada:1900 Date: 2007-09-12T06:01:17+02:00 List-Id: Two merge tools i find resonable are: http://winmerge.org/ (Windows only) http://kdiff3.sourceforge.net/ (Windows and Linux) /Per prichtmyer@yahoo.com wrote: > 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. >