From: geoff@collyer.net
To: 9fans@cse.psu.edu
Subject: Re: [9fans] Re: patch/list sorry/nbroken-8
Date: Wed, 29 Mar 2006 17:56:41 -0800 [thread overview]
Message-ID: <cc6b046ae0e04e878679ac39f12934da@collyer.net> (raw)
In-Reply-To: <01e4f0edc05e0e36f9393457b6df9325@swtch.com>
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
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.
[-- Attachment #2: Type: message/rfc822, Size: 3085 bytes --]
From: "Russ Cox" <rsc@swtch.com>
To: 9fans@cse.psu.edu
Subject: Re: [9fans] Re: patch/list sorry/nbroken-8
Date: Wed, 29 Mar 2006 18:37:39 -0500
Message-ID: <01e4f0edc05e0e36f9393457b6df9325@swtch.com>
> 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
next prev parent reply other threads:[~2006-03-30 1:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <e644f5197ca0a9d59548f0fcf0c49f52@plan9.bell-labs.com>
2006-03-29 22:47 ` uriel
2006-03-29 22:57 ` Steve Simon
2006-03-29 23:01 ` uriel
2006-03-29 23:28 ` Skip Tavakkolian
2006-03-29 23:37 ` Russ Cox
2006-03-30 1:56 ` geoff [this message]
2006-03-30 10:52 ` Richard Miller
2006-03-30 12:15 Fco. J. Ballesteros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc6b046ae0e04e878679ac39f12934da@collyer.net \
--to=geoff@collyer.net \
--cc=9fans@cse.psu.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).