aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2007-12-28 09:59:34 +0000
committerEric S. Raymond2007-12-28 09:59:34 +0000
commitfae001810e4f93293b41c47e01c5fc43ac33df65 (patch)
tree49117b248872afc8036f5724665aa748ac7e6327
parent23dab1c35448d2f04eb730cbab8a849f060b37d4 (diff)
downloademacs-fae001810e4f93293b41c47e01c5fc43ac33df65.tar.gz
emacs-fae001810e4f93293b41c47e01c5fc43ac33df65.zip
Typo fix.
-rw-r--r--lisp/vc-hooks.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 80f12af974a..218c80c04f9 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -485,15 +485,18 @@ For registered files, the value returned is one of:
485 the master file. This state can only occur if locking 485 the master file. This state can only occur if locking
486 is not used for the file. 486 is not used for the file.
487 487
488 'unlocked-changes The current version of the working file is not locked, 488 'unlocked-changes The working version of the file is not locked,
489 but the working file has been changed with respect 489 but the working file has been changed with respect
490 to that version. This state can only occur for files 490 to that version. This state can only occur for files
491 with locking; it represents an erroneous condition that 491 with locking; it represents an erroneous condition that
492 should be resolved by the user (vc-next-action will 492 should be resolved by the user (vc-next-action will
493 prompt the user to do it)." 493 prompt the user to do it).
494
495 'added Scheduled to go into the repository on the next commit.
496 Often represented by vc-working-revision = "0" in VCSes
497 with monotonic IDs like Subversion and Mercxurial."
498
494 ;; FIXME: New (sub)states needed (?): 499 ;; FIXME: New (sub)states needed (?):
495 ;; - `added' (i.e. `edited' but with no base version yet,
496 ;; typically represented by vc-working-revision = "0")
497 ;; - `conflict' (i.e. `edited' with conflict markers) 500 ;; - `conflict' (i.e. `edited' with conflict markers)
498 ;; - `removed' 501 ;; - `removed'
499 ;; - `copied' and `moved' (might be handled by `removed' and `added') 502 ;; - `copied' and `moved' (might be handled by `removed' and `added')