Mercurial > emacs
changeset 87444:e0b3bfbba910
Typo fix.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 28 Dec 2007 09:59:34 +0000 |
| parents | 69dbd59b144d |
| children | 214f565ec827 |
| files | lisp/vc-hooks.el |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-hooks.el Fri Dec 28 09:48:35 2007 +0000 +++ b/lisp/vc-hooks.el Fri Dec 28 09:59:34 2007 +0000 @@ -485,15 +485,18 @@ the master file. This state can only occur if locking is not used for the file. - 'unlocked-changes The current version of the working file is not locked, + 'unlocked-changes The working version of the file is not locked, but the working file has been changed with respect to that version. This state can only occur for files with locking; it represents an erroneous condition that should be resolved by the user (vc-next-action will - prompt the user to do it)." + prompt the user to do it). + + 'added Scheduled to go into the repository on the next commit. + Often represented by vc-working-revision = "0" in VCSes + with monotonic IDs like Subversion and Mercxurial." + ;; FIXME: New (sub)states needed (?): - ;; - `added' (i.e. `edited' but with no base version yet, - ;; typically represented by vc-working-revision = "0") ;; - `conflict' (i.e. `edited' with conflict markers) ;; - `removed' ;; - `copied' and `moved' (might be handled by `removed' and `added')