From owner-freebsd-current@FreeBSD.ORG  Tue Dec 22 14:27:19 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75D561065692
	for <freebsd-current@FreeBSD.org>; Tue, 22 Dec 2009 14:27:19 +0000 (UTC)
	(envelope-from des@des.no)
Received: from smtp.des.no (smtp.des.no [194.63.250.102])
	by mx1.freebsd.org (Postfix) with ESMTP id 383388FC1A
	for <freebsd-current@FreeBSD.org>; Tue, 22 Dec 2009 14:27:18 +0000 (UTC)
Received: from ds4.des.no (des.no [84.49.246.2])
	by smtp.des.no (Postfix) with ESMTP id AFE151FFC1E;
	Tue, 22 Dec 2009 14:27:17 +0000 (UTC)
Received: by ds4.des.no (Postfix, from userid 1001)
	id 6965C84513; Tue, 22 Dec 2009 15:27:17 +0100 (CET)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Anton Shterenlikht <mexas@bristol.ac.uk>
References: <d873d5be0912201722v6269800bx989510d47ace1888@mail.gmail.com>
	<20091222141939.GA60890@mech-cluster241.men.bris.ac.uk>
Date: Tue, 22 Dec 2009 15:27:17 +0100
In-Reply-To: <20091222141939.GA60890@mech-cluster241.men.bris.ac.uk> (Anton
	Shterenlikht's message of "Tue, 22 Dec 2009 14:19:39 +0000")
Message-ID: <86iqbz5bju.fsf@ds4.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: freebsd-current@FreeBSD.org, "b. f." <bf1783@googlemail.com>
Subject: Re: still trouble with pci.c on i386
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2009 14:27:19 -0000

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?

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

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no