From: "Antonin Vecera" <antonin.vecera@gmail.com>
To: "Fans of the OS Plan 9 from Bell Labs" <9fans@9fans.net>
Subject: Re: [9fans] replica question
Date: Sun, 6 Jul 2008 20:07:03 +0200 [thread overview]
Message-ID: <10b109140807061107w707d6546o6d54cb39b0505e54@mail.gmail.com> (raw)
In-Reply-To: <98C569CF-3396-4285-BC02-F3BCDB62C448@mac.com>
On Sun, Jul 6, 2008 at 7:29 PM, Pietro Gagliardi <pietro10@mac.com> wrote:
> Sorry, but I got screwed by that too. -s only works if there is a conflict.
> You'll have to manually copy it from /n/sources/plan9/. Type
>
> 9fs sources
> cp /n/sources/plan9/rc/bin/termc /rc/bin/termrc
There is no conflict. I copied it as you wrote. After that I had local
termrc with different time compared to termrc in sources. I did pull -
and no changes, no conflicts. I don't understand. I expected conflict
because of different modification time.
Antonin
next prev parent reply other threads:[~2008-07-06 18:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-06 17:03 Antonin Vecera
2008-07-06 17:29 ` Pietro Gagliardi
2008-07-06 18:07 ` Antonin Vecera [this message]
2008-07-06 18:31 ` Martin Neubauer
2008-07-06 19:00 ` Antonin Vecera
2011-11-18 9:10 Rudolf Sykora
[not found] <CAOEdRO04cwvjRzmKWVSMBufykKL_CT+XMZS3XFSJZ8O3HRco+w@mail.gmail.c>
2011-11-18 13:40 ` erik quanstrom
2011-11-18 15:59 ` Rudolf Sykora
[not found] ` <CAOEdRO0COVcbuVsUd_1Wd1QyDU-jE_kPccfv36N5_sCZBaay=Q@mail.gmail.c>
2011-11-18 19:25 ` 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=10b109140807061107w707d6546o6d54cb39b0505e54@mail.gmail.com \
--to=antonin.vecera@gmail.com \
--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).