From: rsc@plan9.bell-labs.com
To: 9fans@cse.psu.edu
Subject: Re: [9fans] online updates now available
Date: Tue, 21 May 2002 17:49:13 -0400 [thread overview]
Message-ID: <a791350b126cecdc41495fb1ab098bdf@plan9.bell-labs.com> (raw)
Yes. The "-s" flag says use the server's copy,
the "-c" flag says use the local copy and don't
report the conflict again.
For example, earlier this afternoon I did
(output isn't exact, this is from memory).
g% replica/pull -v /dist/replica/network
...
386/bin/ssh: locally modified; will not update
386/bin/sshnet: locally modified; will not update
lib/ndb/local: locally modified; will not update
...
g%
and resolved these by taking the new ssh binaries:
g% replica/pull -vs /dist/replica/network 386/bin/ssh 386/bin/sshnet
c 386/bin/ssh
c 386/bin/sshnet
g%
Note the lack of rooted slashes in the paths on the command line.
I would have next told replica/pull that I was happy
with lib/ndb/local the way I changed it:
g% replica/pull -vc /dist/replica/network lib/ndb/local
g%
except that when trying to figure out that there shouldn't
be rooted slashes on the pull ssh command line, I tried
g% replica/pull -vs /dist/replica/network
...
g%
which forced the server copy for everything. I don't actually
use /lib/ndb/local, so I was okay. Live and learn.
Russ
next reply other threads:[~2002-05-21 21:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-05-21 21:49 rsc [this message]
-- strict thread matches above, loose matches on Subject: below --
2002-05-29 9:04 forsyth
2002-05-21 20:44 Russ Cox
2002-05-21 21:41 ` Axel Belinfante
2002-05-29 8:48 ` Christopher Nielsen
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=a791350b126cecdc41495fb1ab098bdf@plan9.bell-labs.com \
--to=rsc@plan9.bell-labs.com \
--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).