From owner-freebsd-questions Wed Oct 17 15: 2:40 2001 Delivered-To: freebsd-questions@freebsd.org Received: from snipe.mail.pas.earthlink.net (snipe.mail.pas.earthlink.net [207.217.120.62]) by hub.freebsd.org (Postfix) with ESMTP id AB6F137B403 for ; Wed, 17 Oct 2001 15:02:36 -0700 (PDT) Received: from blossom.cjclark.org (dialup-209.247.137.205.Dial1.SanJose1.Level3.net [209.247.137.205]) by snipe.mail.pas.earthlink.net (8.11.5/8.9.3) with ESMTP id f9HM2Sw27695; Wed, 17 Oct 2001 15:02:28 -0700 (PDT) Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.3) id f9HM2OB01329; Wed, 17 Oct 2001 15:02:24 -0700 (PDT) (envelope-from cjc) Date: Wed, 17 Oct 2001 15:02:24 -0700 From: "Crist J. Clark" To: Micke Josefsson Cc: freebsd-questions@FreeBSD.ORG Subject: Re: Recursive diff? How? Message-ID: <20011017150223.A373@blossom.cjclark.org> Reply-To: cjclark@alum.mit.edu References: <20011016234237.B6985@blossom.cjclark.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from mj@isy.liu.se on Wed, Oct 17, 2001 at 10:58:59AM +0200 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Oct 17, 2001 at 10:58:59AM +0200, Micke Josefsson wrote: > > On 17-Oct-2001 Crist J. Clark wrote: > > On Wed, Oct 17, 2001 at 07:57:24AM +0200, Micke Josefsson wrote: > >> In my attempt to port uClinux development environment to FreeBSD I have > >> edited > >> many files down the uClinux source directory. Is there anyway of doing a > >> recursive diff so that it would also be easy to patch a newly installed > >> source? > >> > >> diff -r seems ok, but when I patch with the result it wants me to specify the > >> exact filenames. Is there a better way? CVS? > > > > The 'diff -r' should handle this fine. Are you running the 'diff -r' > > in the same relative location to where you are running the 'patch' > > command or using the -p option correctly? Are your running the diff(1) > > command someplace where you have different directory name in between > > the pwd and the source files than on the machine you run patch(1)? > > > Thanks for bothering with this but I just can't seem to get it right. > > Lets get down to cases (I've tried every combination I can think of:). > > in my ~/tmp I have two source trees. One original and one modified: > > src src.orig > > I make a diff as per man page of diff: > > diff -crN src.orig src > src.diff > > How do I apply that src.diff onto the 'real' original sources at > /opt/uClinux/src? > > A simple 'cd /opt/uClinux; patch < src.diff' wont do it. Nor any combination of > -p[1-7]. > > > > I have also tried going down into /opt/uClinux/src etc to no avail. I would expect if the 'src.orig' and 'src' trees are structured like '/opt/uClinux/src', that, $ cd /opt/uClinux $ patch < src.diff Should work. What does the prompting from patch(1) look like? What does the top of one of the diff's look like; the first two lines with the pathnames? How does it compare to the file structure as seen from /opt/uClinux/src. -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message