From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: To: 9fans@cse.psu.edu Subject: Re: [9fans] Re: patch/list sorry/nbroken-8 Date: Wed, 29 Mar 2006 17:56:41 -0800 From: geoff@collyer.net In-Reply-To: <01e4f0edc05e0e36f9393457b6df9325@swtch.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="upas-srmzwmqpuhddduvobqprfjueim" Topicbox-Message-UUID: 25eb1848-ead1-11e9-9d60-3106f5b1d025 This is a multi-part message in MIME format. --upas-srmzwmqpuhddduvobqprfjueim Content-Disposition: inline Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Actually, I pull -s the new file, idiff `{yesterday file} file >NEW Once I'm convinced that NEW is a correct merger, cp NEW file It's a tiny amount of work. --upas-srmzwmqpuhddduvobqprfjueim Content-Type: message/rfc822 Content-Disposition: inline Received: from collyer.net ([216.240.55.164]) by collyer.net; Wed Mar 29 15:38:01 PST 2006 Received: from mail.cse.psu.edu ([130.203.4.6]) by collyer.net; Wed Mar 29 15:38:00 PST 2006 Received: from psuvax1.cse.psu.edu (localhost [127.0.0.1]) by mail.cse.psu.edu (CSE Mail Server) with ESMTP id C8FA912E1E for ; Wed, 29 Mar 2006 18:37:59 -0500 (EST) X-Original-To: 9fans@cse.psu.edu Delivered-To: 9fans@cse.psu.edu Received: from localhost (localhost [127.0.0.1]) by mail.cse.psu.edu (CSE Mail Server) with ESMTP id 5E9B612DE2 for <9fans@cse.psu.edu>; Wed, 29 Mar 2006 18:37:44 -0500 (EST) Received: from mail.cse.psu.edu ([127.0.0.1]) by localhost (psuvax1 [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 17162-01-41 for <9fans@cse.psu.edu>; Wed, 29 Mar 2006 18:37:43 -0500 (EST) Received: from holo.morphisms.net (holo.morphisms.net [216.254.78.15]) by mail.cse.psu.edu (CSE Mail Server) with ESMTP id 9057E12DDF for <9fans@cse.psu.edu>; Wed, 29 Mar 2006 18:37:43 -0500 (EST) Received: by holo.morphisms.net (Postfix, from userid 124) id D384E1E8C3A; Wed, 29 Mar 2006 18:36:42 -0500 (EST) Received: from tux (tux.lcs.mit.edu [18.26.4.157]) by holo.morphisms.net with SMTP; Wed, 29 Mar 2006 18:36:41 -0500 (EST) (envelope-from rsc@swtch.com) X-Avenger: version=0.7.4; receiver=holo.morphisms.net; client-ip=18.26.4.157; client-port=41248; syn-fingerprint=5840:53:1:60:M1460,S,T,N,W0 Linux 2.4/2.6; data-bytes=0 Message-ID: <01e4f0edc05e0e36f9393457b6df9325@swtch.com> To: 9fans@cse.psu.edu Subject: Re: [9fans] Re: patch/list sorry/nbroken-8 From: "Russ Cox" Date: Wed, 29 Mar 2006 18:37:39 -0500 In-Reply-To: <5f0780bda86d12586b41975a5458aa1e@cat-v.org> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at cse.psu.edu X-BeenThere: 9fans@cse.psu.edu X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Fans of the OS Plan 9 from Bell Labs <9fans@cse.psu.edu> List-Id: Fans of the OS Plan 9 from Bell Labs <9fans.cse.psu.edu> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: 9fans-bounces+geoff.9fans=collyer.net@cse.psu.edu Errors-To: 9fans-bounces+geoff.9fans=collyer.net@cse.psu.edu > Note also that keeping a customized version of the kernel source locally is > completely unacceptable. You keep saying that, but that doesn't make it true. It's actually very common for people to keep customized versions of source in /sys/src. When you pull, if one of those files is new then you have to diff it and make the changes by hand, then run pull -c to tell replica that you've taken care of that. It's not hard. Russ --upas-srmzwmqpuhddduvobqprfjueim--