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,FREEMAIL_FROM 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!news1.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!local01.nntp.dca.giganews.com!nntp.comcast.com!news.comcast.com.POSTED!not-for-mail NNTP-Posting-Date: Wed, 12 Sep 2007 22:48:20 -0500 From: "Steve" Newsgroups: comp.lang.ada References: <1189562448.148837.261350@r29g2000hsg.googlegroups.com> Subject: Re: Merging Ada Files Date: Wed, 12 Sep 2007 20:48:36 -0700 X-Priority: 3 X-MSMail-Priority: Normal X-Newsreader: Microsoft Outlook Express 6.00.2900.3138 X-RFC2646: Format=Flowed; Original X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3138 Message-ID: X-Usenet-Provider: http://www.giganews.com NNTP-Posting-Host: 24.20.111.206 X-Trace: sv3-ZWz7i3mAlOLbhaEjAlihNHydplhXVPwhLEHH88VcBcDQzDaaZLhuADmJhYx9EK7I6By0XHmUaHdCJRd!3kWJ2gz470ZPt7PpnbswxYrG9i1/xExVJsrwQVo8lzA0ZZ6VXcvL9klFjLFEXKU/Zslme451e5/t!mpNCllLIfp7eE4erMf4wyOCxXVkCDg== X-Complaints-To: abuse@comcast.net X-DMCA-Complaints-To: dmca@comcast.net X-Abuse-and-DMCA-Info: Please be sure to forward a copy of ALL headers X-Abuse-and-DMCA-Info: Otherwise we will be unable to process your complaint properly X-Postfilter: 1.3.35 Xref: g2news2.google.com comp.lang.ada:1936 Date: 2007-09-12T20:48:36-07:00 List-Id: wrote in message news:1189562448.148837.261350@r29g2000hsg.googlegroups.com... > 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. > If I were given this task, I would use TortoiseSVN on Windows as follows: 1) Create a repository and commit the file(s) in the initial state before the independent evolution occurred. 2) Create two working copies, one for each of the derived versions, call them verisions A and B. 3) Copy one of the derivatives into version A and the other into version B. 4) Commit the changes from version A to the respository. 5) Perform an "Update" to the working copy of version B. If there are conflicts in the working copy of version B use the merge tool provided with TortoiseSVN to resolve the conflicts (or any other suitable tool). 6) Commit the the changes from version B to the repository. The history log of the repository will have one version that lists the changes that were committed by version A and the changes that were committed by version B. If you do a "show log" operation and then right click on an individual file and pick "Blame" you will get a file listing that annotates the source of individual changes. When a conflict gets to hairy to merge using a 3 way merge tool, I often resolve the difficult areas by hand using a 2 way tool. The best tool I have seen for two file comparisons and merge is by far "Beyond Compare". It is an inexpensive non-free tool on windows that is way ahead of anything else I have used. Regards Steve (The Duck)