From mboxrd@z Thu Jan  1 00:00:00 1970
To: 9fans@cse.psu.edu
Subject: Re: [9fans] bell-labs website and plan9
From: "Russ Cox" <rsc@swtch.com>
Date: Mon,  9 Apr 2007 13:51:01 -0400
In-Reply-To: <9ab217670704090918x313c4f0dr6476bbe7e1e66590@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Message-Id: <20070409175040.F16EB1E8C1F@holo.morphisms.net>
Topicbox-Message-UUID: 426ff51e-ead2-11e9-9d60-3106f5b1d025

> should expect this to work. Specific example, /sys/src/cmd/ip/ping.c
> was modified for my hushping patch, but pull didn't grab it because I
> had modified the copy there. If I run pull again with -s '', will it
> get that file this time?

You get one override per line in plan9.log.
If you have already run replica -c sys/src/cmd/ip/ping.c,
then future pulls will not worry about the change that
just happened.  Future changes will make new conflicts
that you'll have to resolve.  If you haven't done that,
then you can still run pull -s sys/src/cmd/ip/ping.c
and will get the new one.

Russ