From owner-freebsd-hackers Mon Dec 22 15:21:44 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id PAA09336 for hackers-outgoing; Mon, 22 Dec 1997 15:21:44 -0800 (PST) (envelope-from owner-freebsd-hackers) Received: from mail.virginia.edu (mail.Virginia.EDU [128.143.2.9]) by hub.freebsd.org (8.8.7/8.8.7) with SMTP id PAA09315 for ; Mon, 22 Dec 1997 15:21:30 -0800 (PST) (envelope-from atf3r@cs.virginia.edu) Received: from mail.cs.virginia.edu by mail.virginia.edu id aa18869; 22 Dec 97 18:21 EST Received: from mamba.cs.Virginia.EDU (mamba-fo.cs.Virginia.EDU [128.143.136.18]) by ares.cs.Virginia.EDU (8.8.5/8.8.5) with ESMTP id SAA12548; Mon, 22 Dec 1997 18:21:15 -0500 (EST) Received: from localhost (atf3r@localhost) by mamba.cs.Virginia.EDU (8.7.5/8.7.3) with SMTP id SAA21590; Mon, 22 Dec 1997 18:21:14 -0500 (EST) X-Authentication-Warning: mamba.cs.Virginia.EDU: atf3r owned process doing -bs Date: Mon, 22 Dec 1997 18:21:14 -0500 (EST) From: "Adrian T. Filipi-Martin" Reply-To: Adrian Filipi-Martin To: Julian Elischer cc: hackers@freebsd.org Subject: Re: Anyone remember this (diff) program? In-Reply-To: <349EDB18.59E2B600@whistle.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset= Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from QUOTED-PRINTABLE to 8bit by hub.freebsd.org id PAA09318 Sender: owner-freebsd-hackers@freebsd.org X-Loop: FreeBSD.org Precedence: bulk On Mon, 22 Dec 1997, Julian Elischer wrote: > long long time ago, in a galaxy far far away, > someone gave a reference (in the 1993 timeframe) to a graphical diff > program they had written. > It also (I think) could do merges, but the saliant feature that I > remember was that each file had a side-bar, that represented th > whole file, with parts that differed being shown on orange, with > lines indicating which unchanged (blue) section corresponded with > which (blue) section in the side-bar of the other file. > > Does anyone know what became of this..? > it was truely a magic program. > > you could get the program to do merges > as it also had a 3rd window which would take > cut'n'paste sections fom the others, or you could > click on a diff and have that bit incorporated.. I don't remember such a program, but are you familiar with the ediff-mode in emacs/xemacs? It lets you view both old and new file ˆversoins with the different portions highlighted. It supports patching from one to the other, three way diff's and even understands the version control mode. cheers, Adrian -- adrian@virginia.edu ---->>>>| If I were stranded on a desert island, and System Administrator --->>>| I could only have one OS for my computer, Neurosurgical Visualzation Lab -->>| it would be FreeBSD. Think about it..... http://www.nvl.virginia.edu/ ->| http://www.freebsd.org/