File Annotation
Not logged in
6d6959b47d 2008-11-17    kejoki: <h2>update</h2>
6d6959b47d 2008-11-17    kejoki: 
51868cb12f 2009-01-30    kejoki: <u>Updating</u> a repository is the process of applying to it changes
51868cb12f 2009-01-30    kejoki: made by external entities.  Contrast this with [./cmd_commit.wiki |
51868cb12f 2009-01-30    kejoki: commit]ing a locally made change; updating is a bit like "committing"
51868cb12f 2009-01-30    kejoki: external changes to the local repo.
6d6959b47d 2008-11-17    kejoki: 
6d6959b47d 2008-11-17    kejoki: Update <em>merges</em> changes from the repository into your checkout.
51868cb12f 2009-01-30    kejoki: That means that it won't have any effect unless there <i>are</i>
51868cb12f 2009-01-30    kejoki: changes in the repository.  The only way the checkout can affect
51868cb12f 2009-01-30    kejoki: the repo (this is the local repo we're talking about) is if you
51868cb12f 2009-01-30    kejoki: do a [./cmd_commit.wiki | <code>ci</code>].  So, <code>update</code>
51868cb12f 2009-01-30    kejoki: only really makes sense if you have
51868cb12f 2009-01-30    kejoki: [./cmd_pull.wiki | <code>pull</code>]ed changes from the master repository
51868cb12f 2009-01-30    kejoki: into the local repository.
6d6959b47d 2008-11-17    kejoki: 
51868cb12f 2009-01-30    kejoki: <annotation>
51868cb12f 2009-01-30    kejoki:   Note :
51868cb12f 2009-01-30    kejoki:   really really need a quick overview of the pull-update-edit-commit-push
51868cb12f 2009-01-30    kejoki:   workflow, and the shortcuts for that, and re-emphasize the role of autosync
51868cb12f 2009-01-30    kejoki:   in changing the basic nature of the workflow
51868cb12f 2009-01-30    kejoki: </annotation>
6d6959b47d 2008-11-17    kejoki: 
1eb067d456 2008-12-12    kejoki: Local intranet <code>[./cmd_commit.wiki | commit]</code>s
6d6959b47d 2008-11-17    kejoki: (by someone else)
1eb067d456 2008-12-12    kejoki: or Net <code>[./cmd_pull.wiki | pull]</code>s from a server
51868cb12f 2009-01-30    kejoki: will usually require a <code>fossil&nbsp;update</code> afterward,
51868cb12f 2009-01-30    kejoki: because they are likely not to be done in
51868cb12f 2009-01-30    kejoki: [./cmd_settings.wiki#autosync | autosync]
51868cb12f 2009-01-30    kejoki: mode.
6d6959b47d 2008-11-17    kejoki: 
6d6959b47d 2008-11-17    kejoki: Local commits are likely to be made with
1eb067d456 2008-12-12    kejoki: [./cmd_settings.wiki#autosync | automatic syncing]
6d6959b47d 2008-11-17    kejoki: set to "on", however, so if you don't use <b>fossil</b> for Net-wide
6d6959b47d 2008-11-17    kejoki: projects you may never have to use <code>update</code>.
6d6959b47d 2008-11-17    kejoki: 
1eb067d456 2008-12-12    kejoki: See also: [./cmd_pull.wiki | fossil pull],
1eb067d456 2008-12-12    kejoki: [./cmd_commit.wiki | fossil commit],
1eb067d456 2008-12-12    kejoki: [./cmd_settings.wiki#autosync | fossil setting] (autosync),
51868cb12f 2009-01-30    kejoki: [./branching.wiki | <i>branching, merging, forking and tagging</i>],
1eb067d456 2008-12-12    kejoki: [./reference.wiki | Reference]