From mboxrd@z Thu Jan  1 00:00:00 1970
To: 9fans@cse.psu.edu
From: "Russ Cox" <rsc@swtch.com>
Date: Sat, 28 Jan 2006 15:22:07 -0500
Message-Id: <20060128202212.4B0ED1E8C36@holo.morphisms.net>
Subject: [9fans] pull - read this!
Topicbox-Message-UUID: ebbad4ce-ead0-11e9-9d60-3106f5b1d025

THE OPTIONS TO PULL HAVE CHANGED - READ THIS MESSAGE!

I don't have the energy to explain the antiword behavior in full,
but I just made some changes that should make it less
likely going forward.

I changed the way -c and -s work in pull (which is really
replica/applylog for the purposes of this discussion).

Before, the only way to safely make pull remember that
it had done some -c stuff was to run replica/pull -vc
with no patterns and hope that no new server changes
had appeared since the last pull you did (usually seconds
before).  I made pull a little more aggressive about updating
its "I'm done with the log up to this point" time, but if
you get really far behind and are trying to catch up, it's
just not good enough.

Instead, I changed -c and -s.

Now, instead of -c and -s applying to all possible files
encountered, they take names as arguments and only
apply to those.  This means you can specify both on
a command line.

So for example, I just updated my own system:

	% pull
	sys/src/cmd/8c/txt.c: locally modified; will not update
	sys/src/cmd/venti/config.c: locally removed; will not update
	sys/src/cmd/venti/fmtindex.c: locally removed; will not update
	386/bin/replica/applylog: locally modified; will not update
	sys/src/cmd/replica/applylog.c: locally modified; will not update
	%

and then had to address the conflicts.  I wanted to keep
my venti changes but the others could be overwritten:

	% pull -c sys/src/cmd/venti -c 386/bin/replica \
		-c sys/src/cmd/replica -s sys/src/cmd/8c
	% pull
	c sys/src/cmd/8c/txt.c
	%

Because the options changed to take arguments, I had
to update /usr/glenda/bin/rc/pull and /rc/bin/replica/defs too.

If you have your own copy of glenda's pull script, 
you'll want to incorporate the changes.  Or just make
yours run hers:

	% cat /usr/rsc/bin/rc/pull
	#!/bin/rc
	exec /usr/glenda/bin/rc/pull $*
	% 

The man pages are updated too.

All this won't take effect until you do a pull and get the new files.

Russ