On Sun, Oct 11, 2009 at 8:01 PM, Carl Jolly <cwjo...@gmail.com> wrote:

> I have 2 users each with their own local repositories and local checkouts.
> I have a server
> that keeps the two user repositories in sync.  I have  done "fossil update"
> on both user
> repositories and have verified that the repo knows about a new file that
> one of the user
> has introduced.


a) Is autosync on (see "fossil config")?
b) If not, try "fossil pull" before doing "fossil update".

In fossil the update and pull are two separate steps unless autosync is on.
In the latter case, "update" will also pull in any remote changes. This is
unfortunately not so clear in the online help, but is easy once one realizes
the differences between the two commands. This behaviour allows one to
update to any given version without network traffic, provided the version
exists in the local copy of the repo.


~> f help pull
Usage: f pull ?URL? ?-R|--respository REPOSITORY?

Pull changes from a remote repository into the local repository.

If the URL is not specified, then the URL from the most recent
clone, push, pull, remote-url, or sync command is used.

See also: clone, push, sync, remote-url

~> f help update
Usage: f update ?VERSION? ?--latest?

The optional argument is a version that should become the current
version.  If the argument is omitted, then use the leaf of the
tree that begins with the current version, if there is only a
single leaf.  If there are a multiple leaves, the latest is used
if the --latest flag is present.

This command is different from the "checkout" in that edits are
not overwritten.  Edits are merged into the new version.


-- 
----- stephan beal
http://wanderinghorse.net/home/stephan/
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to