From owner-freebsd-current Tue May 14 20:23:28 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id UAA09132 for current-outgoing; Tue, 14 May 1996 20:23:28 -0700 (PDT) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id UAA09124 for ; Tue, 14 May 1996 20:23:23 -0700 (PDT) Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.12/8.6.9) id NAA31392; Wed, 15 May 1996 13:17:27 +1000 Date: Wed, 15 May 1996 13:17:27 +1000 From: Bruce Evans Message-Id: <199605150317.NAA31392@godzilla.zeta.org.au> To: bde@zeta.org.au, jmacd@CS.Berkeley.EDU Subject: Re: version of makeinfo in -current Cc: freebsd-current@freebsd.org Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk >> Diffs aren't sufficent, since there is a vendor branch to track, and >> the desirability of tracking the vendor branch to reconsider, and the >> desirability of keeping gnu stuff in the core sources to reconsider. >> ... >I understand the problem you raise here. Can you think of a solution >to the problem of diffing files which have changed names and paths? Don't change them in the first place. Use subdirectories as in mrouted to hold the bmaked parts. I think this would only be a big change for gcc. The current gnu as and ld are too different to import on top of our versions, and the other gnu programs in the tree are closer to the (old) gnu versions. >It would be a not-so-difficult addition to PRCS (a version control >system I'm developing) to offer a merge-files-by-true-descendent- It will be a difficult problem to swtich from cvs :-[. Bruce