From owner-freebsd-current@FreeBSD.ORG Wed Dec 15 22:11:18 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BAE616A4CE; Wed, 15 Dec 2004 22:11:18 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3903E43D5D; Wed, 15 Dec 2004 22:11:18 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id 1232A7A44E; Wed, 15 Dec 2004 14:11:18 -0800 (PST) Message-ID: <41C0B685.6050203@elischer.org> Date: Wed, 15 Dec 2004 14:11:17 -0800 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: Matthias Andree References: <41BF6D42.7040508@elischer.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: ports@freebsd.org cc: FreeBSD Current Subject: Re: looking for a merge tool. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 22:11:18 -0000 And the winner is: a tool Bob Willcox wrote called "tkmerge" Absolutly the EXACT right tool for the job. Two panes for sources, a 3rd for the output and a 4th for control and additional change editing that you might need to tailor teh diff you have selected. Bob, A port of this app would be brilliant! maybe one of the ports guru's can help you knock up a small port for the ports/packages collection. Matthias Andree wrote: >Julian Elischer writes: > > > >>I'm doing a bit of merging fromthe NetBSD USB code to -current, >>but I'm wonderring if anyone can point me to a good merge tool. >> >>I'm currently using mgdiff which shows the two files in >>adjoing panes with the differences coloured and allows you to >>select the diffs from the left or right windows. quite good until >>you need the third option, which is "both" or "the left, but with >>a small edit" >> >>does anyone know of a tool that gives 3 panes and allows manual >>editing of the merged product >> bob's email: >>Hi Julian, >> >>Here is a tk based program (two files attached) that I wrote a few years >>back that might do what you want. It is similar to your description of >>mgdiff but includes a "Both" and "Editor" button to let you select both >>or to edit both with your favorite editor. You may need to edit the >>third line of tkmerge, depending on which version of wish you have. It >>should work with any recent (in the past 5 years) version. >> >>Let me know how it works for you... >> >>Bob >> >>