9fans - fans of the OS Plan 9 from Bell Labs
 help / color / mirror / Atom feed
From: "Steve Simon" <steve@quintile.net>
To: 9fans@9fans.net
Subject: Re: [9fans] /sys/src/9/ip/ip.h
Date: Sun,  4 Oct 2009 18:17:02 +0100	[thread overview]
Message-ID: <b7ca94cb78046a453b51164995343ab1@quintile.net> (raw)
In-Reply-To: <4fe555158822df97a22b2076cc02e52a@9netics.com>

> perhaps the elimination of all traces of IL is a little too thorough?

I see no real harm in IL but, just a suggestion, you could do a pull -s,
and then use diff3 (in my contrib) to do a merge between ip.h.orig,
yesterday(1)'s version and the newly pulled code.

having said this I still have it on my To-do list to add a -m (merge)
option to replica to do just this; one day.

-Steve



  reply	other threads:[~2009-10-04 17:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-04 16:46 Skip Tavakkolian
2009-10-04 17:17 ` Steve Simon [this message]
     [not found] <<4fe555158822df97a22b2076cc02e52a@9netics.com>
2009-10-04 17:28 ` erik quanstrom

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=b7ca94cb78046a453b51164995343ab1@quintile.net \
    --to=steve@quintile.net \
    --cc=9fans@9fans.net \
    /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).