Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Dec 2009 15:36:38 +0000
From:      Anton Shterenlikht <mexas@bristol.ac.uk>
To:        Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= <des@des.no>
Cc:        freebsd-current@freebsd.org, Anton Shterenlikht <mexas@bristol.ac.uk>, "b. f." <bf1783@googlemail.com>
Subject:   Re: still trouble with pci.c on i386
Message-ID:  <20091222153638.GB61098@mech-cluster241.men.bris.ac.uk>
In-Reply-To: <86iqbz5bju.fsf@ds4.des.no>
References:  <d873d5be0912201722v6269800bx989510d47ace1888@mail.gmail.com> <20091222141939.GA60890@mech-cluster241.men.bris.ac.uk> <86iqbz5bju.fsf@ds4.des.no>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Dec 22, 2009 at 03:27:17PM +0100, Dag-Erling Smørgrav wrote:
> Anton Shterenlikht <mexas@bristol.ac.uk> writes:
> > However, I'm not sure
> > what the strategy is for reverting to previous revisions.
> > For example if I know (from previous posts) that r 200341
> > breaks src/sys/dev/pci/pci.c and pci_pci.c, then which
> > revision should I sync with?
> 
> r200340, of course.
> 
> > First I updated all src:
> >
> > svn update svn://svn.freebsd.org/base/head /usr/src
> >
> > then I reverted to r 200315, but only for pci src:
> >
> > svn update -r 200315 svn://svn.freebsd.org/base/head/sys/dev/pci /usr/src/sys/dev/pci
> 
> Umm, is your /usr/src actually a Subversion working copy?
> 
> Both svn commands are wrong, didn't you notice the error messages?

no, I don't think so.

I tried to follow this guide: http://wiki.freebsd.org/SubversionPrimer

and this book: http://svnbook.red-bean.com/

Are these adequate? 

> The easiest way to do this is to apply the problematic revision in
> reverse:
> 
> % cd /usr/src/sys
> % svn diff -c200341 http://svn.freebsd.org/base/head/sys | patch -R

ok, will try

and is there a way to rebuild just a part of src? For example, 
if I've built all src already, then applied a patch to just one
file, as in this case, can I somehow just rebuild pci.c? Or is
it not that simple? 

I apologise if this is described in the manual somewhere.

many thanks
anton

-- 
Anton Shterenlikht
Room 2.6, Queen's Building
Mech Eng Dept
Bristol University
University Walk, Bristol BS8 1TR, UK
Tel: +44 (0)117 331 5944
Fax: +44 (0)117 929 4423



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091222153638.GB61098>