From mboxrd@z Thu Jan  1 00:00:00 1970
Message-ID: <a791350b126cecdc41495fb1ab098bdf@plan9.bell-labs.com>
To: 9fans@cse.psu.edu
Subject: Re: [9fans] online updates now available
From: rsc@plan9.bell-labs.com
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Date: Tue, 21 May 2002 17:49:13 -0400
Topicbox-Message-UUID: 997e91c4-eaca-11e9-9e20-41e7f4b1d025

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