# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1248331095 14400
# Node ID b9124c78672ff5ce1dbeb996f09963dcabb588f6
# Parent  240e531b5fc73d4b7766f91cadd9975e0df96fe8
Add the documentation for the {update} keyword.

diff -r 240e531b5fc7 -r b9124c78672f README
--- a/README	Thu Jul 23 02:38:02 2009 -0400
+++ b/README	Thu Jul 23 02:38:15 2009 -0400
@@ -63,6 +63,7 @@
 * **root|basename:** the directory name of the root of the current repository.  For example, if the repository is in `/home/u/myrepo` then this keyword would expand to `myrepo`.
 * **status:**  `!` if the repository has any changed/added/removed files, otherwise `?` if it has any untracked (but not ignored) files, otherwise nothing.
 * **task:** the current task (requires the [tasks]() extension)
+* **update:** "^" if the current parent is not the tip of the current branch, otherwise nothing.  In effect, this lets you see if running `hg update` would do something.
 
 [bookmarks]: http://mercurial.selenic.com/wiki/BookmarksExtension
 [tasks]: http://bitbucket.org/alu/hgtasks/wiki/Home
diff -r 240e531b5fc7 -r b9124c78672f prompt.py
--- a/prompt.py	Thu Jul 23 02:38:02 2009 -0400
+++ b/prompt.py	Thu Jul 23 02:38:15 2009 -0400
@@ -75,6 +75,9 @@
         modified, added, removed, or deleted, otherwise "?" if it contains
         untracked (and not ignored) files, otherwise nothing.
     - task: the current task (requires the tasks extension)
+    - update: "^" if the current parent is not the tip of the current branch,
+        otherwise nothing.  In effect, this lets you see if running 
+        'hg update' would do something.
     
     There are also several keywords that deal with the status of remote
     repositories.  They cache their results in .hg/prompt/cache/ and refresh