From owner-freebsd-ports@FreeBSD.ORG Thu Dec 16 13:01:03 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF60516A4CE; Thu, 16 Dec 2004 13:01:03 +0000 (GMT) Received: from c71.sam-solutions.net (c71.sam-solutions.net [217.21.35.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3FB543D39; Thu, 16 Dec 2004 13:01:02 +0000 (GMT) (envelope-from bob@immure.com) Received: from mail pickup service by c71.sam-solutions.net with Microsoft SMTPSVC; Thu, 16 Dec 2004 15:00:30 +0200 Received: from mail.sam-solutions.net ([217.21.35.41]) by c71.sam-solutions.net over TLS secured channel with Microsoft SMTPSVC(6.0.3790.211); Thu, 16 Dec 2004 00:22:53 +0200 Received: from speedy.tutby.com ([195.209.41.194] helo=tut.by) by mail.sam-solutions.net with esmtp (Exim 4.34) id 1CehXu-0000LB-6K for m.boyarov@sam-solutions.net; Thu, 16 Dec 2004 00:22:58 +0200 Received: from by tut.by (CommuniGate Pro RULES 4.1.8) with RULES id 47435439; Thu, 16 Dec 2004 00:22:56 +0200 X-Autogenerated: Mirror X-Mirrored-by: Received: from [195.209.34.110] (HELO tut.by) by tut.by (CommuniGate Pro SMTP 4.1.8) with ESMTP id 47435448 for max_b@tut.by; Thu, 16 Dec 2004 00:22:56 +0200 Received: from mx13.mail.ru ([194.67.23.56] verified) by tut.by (CommuniGate Pro SMTP 4.1.8) with ESMTP id 167872933 for max_b@tut.by; Thu, 16 Dec 2004 01:20:36 +0200 Received: from mail by mx13.mail.ru with local id 1CehXs-000Lkb-00 for max_b@tut.by; Thu, 16 Dec 2004 01:22:56 +0300 X-ResentFrom: Received: from [216.136.204.119] (port=25 helo=mx2.freebsd.org) by mx13.mail.ru with esmtp id 1CehXq-000Lk2-00 for m.boyarov@bk.ru; Thu, 16 Dec 2004 01:22:54 +0300 Received-SPF: pass (mx13.mail.ru: domain of freebsd.org designates 216.136.204.119 as permitted sender) client-ip=216.136.204.119; envelope-from=owner-freebsd-current@freebsd.org; helo=mx2.freebsd.org; Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5625E5744E; Wed, 15 Dec 2004 22:22:10 +0000 (GMT) (envelope-from owner-freebsd-current@freebsd.org) Received: from hub.freebsd.org (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id EA25516A55F; Wed, 15 Dec 2004 22:21:53 +0000 (GMT) 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 0519116A4D1; Wed, 15 Dec 2004 22:21:46 +0000 (GMT) Received: from pimout3-ext.prodigy.net (pimout3-ext.prodigy.net [207.115.63.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C8E343D53; Wed, 15 Dec 2004 22:21:45 +0000 (GMT) (envelope-from bob@immure.com) Received: from maul.immure.com (adsl-66-136-206-1.dsl.austtx.swbell.net [66.136.206.1])iBFML6Nb083524; Wed, 15 Dec 2004 17:21:06 -0500 Received: from luke.immure.com (luke.immure.com [10.1.132.3]) by maul.immure.com (8.13.1/8.12.11) with ESMTP id iBFML17h059753; Wed, 15 Dec 2004 16:21:01 -0600 (CST) (envelope-from bob@immure.com) Received: from luke.immure.com (localhost [127.0.0.1]) by luke.immure.com (8.12.11/8.12.11) with ESMTP id iBFML1pX060049; Wed, 15 Dec 2004 16:21:01 -0600 (CST) (envelope-from bob@luke.immure.com) Received: (from bob@localhost) by luke.immure.com (8.12.11/8.12.11/Submit) id iBFML13d060048; Wed, 15 Dec 2004 16:21:01 -0600 (CST) (envelope-from bob) Date: Wed, 15 Dec 2004 16:21:01 -0600 From: Bob Willcox To: Julian Elischer Message-ID: <20041215222101.GF53203@luke.immure.com> References: <41BF6D42.7040508@elischer.org> <41C0B685.6050203@elischer.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <41C0B685.6050203@elischer.org> User-Agent: Mutt/1.5.6i X-immure-MailScanner-Information: Please contact the ISP for more information X-immure-MailScanner: Found to be clean X-MailScanner-From: bob@immure.com X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Sender: owner-freebsd-current@freebsd.org X-Spam: Not detected X-Spam-Scanned-By: Spamassassin X-Virus-Scanned-By: AVP Antivirus X-OriginalArrivalTime: 15 Dec 2004 22:22:53.0967 (UTC) FILETIME=[9EF069F0:01C4E2F4] cc: ports@freebsd.org cc: FreeBSD Current cc: Matthias Andree Subject: Re: looking for a merge tool. X-BeenThere: freebsd-ports@freebsd.org Reply-To: Bob Willcox List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Dec 2004 13:01:03 -0000 On Wed, Dec 15, 2004 at 02:11:17PM -0800, Julian Elischer wrote: > 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. I would be happy to help with this. Having never done a port, however, I'm sure I will require some guidance. > > > 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 > >> > >> -- Bob Willcox We may not return the affection of those who like bob@immure.com us, but we always respect their good judgement. Austin, TX _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"