Differences From:
File www/cmd_update.wiki part of check-in [1eb067d456] - Adjust some wikilinks, clean up main ref page, add "new" command. by kejoki on 2008-12-12 21:55:46. [view]
To:
File www/cmd_update.wiki part of check-in [51868cb12f] - Changed update docs, ** ADDED A _SPECIAL_ (but MUTYPE_BLOCK) wikitag <annotation> to put html comments in wikimarkup by kkennell on 2009-01-30 21:18:10. [view]
@@ -1,25 +1,34 @@ <h2>update</h2> -What do you do if you have changes out on a repository and -you want them merged with your checkout? - -You use the <code>update</code> command. - -<b>fossil</b> can [./about_checkout.wiki | overwrite] any -changes you've made to your checkout, or it can -[./about_merge.wiki | merge] whatever changes have occurred -in the repo into your checkout. +<u>Updating</u> a repository is the process of applying to it changes +made by external entities. Contrast this with [./cmd_commit.wiki | +commit]ing a locally made change; updating is a bit like "committing" +external changes to the local repo. Update <em>merges</em> changes from the repository into your checkout. +That means that it won't have any effect unless there <i>are</i> +changes in the repository. The only way the checkout can affect +the repo (this is the local repo we're talking about) is if you +do a [./cmd_commit.wiki | <code>ci</code>]. So, <code>update</code> +only really makes sense if you have +[./cmd_pull.wiki | <code>pull</code>]ed changes from the master repository +into the local repository. -<b>fossil</b> uses a simple conflict resolution strategy for merges: -the latest change wins. +<annotation> + Note : + really really need a quick overview of the pull-update-edit-commit-push + workflow, and the shortcuts for that, and re-emphasize the role of autosync + in changing the basic nature of the workflow +</annotation> Local intranet <code>[./cmd_commit.wiki | commit]</code>s (by someone else) or Net <code>[./cmd_pull.wiki | pull]</code>s from a server -will usually require a <code>fossil update</code> afterward. +will usually require a <code>fossil update</code> afterward, +because they are likely not to be done in +[./cmd_settings.wiki#autosync | autosync] +mode. Local commits are likely to be made with [./cmd_settings.wiki#autosync | automatic syncing] set to "on", however, so if you don't use <b>fossil</b> for Net-wide @@ -27,7 +36,6 @@ See also: [./cmd_pull.wiki | fossil pull], [./cmd_commit.wiki | fossil commit], [./cmd_settings.wiki#autosync | fossil setting] (autosync), -[./about_checkout.wiki | <i>checkouts</i>], -[./about_merge.wiki | <i>merging</i>], +[./branching.wiki | <i>branching, merging, forking and tagging</i>], [./reference.wiki | Reference]