Mercurial > emacs
comparison lisp/vc-hooks.el @ 87444:e0b3bfbba910
Typo fix.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 28 Dec 2007 09:59:34 +0000 |
| parents | 860a7a8e779e |
| children | 214f565ec827 |
comparison
equal
deleted
inserted
replaced
| 87443:69dbd59b144d | 87444:e0b3bfbba910 |
|---|---|
| 483 'needs-merge The file has been edited by the user, and there is also | 483 'needs-merge The file has been edited by the user, and there is also |
| 484 a more recent version on the current branch stored in | 484 a more recent version on the current branch stored in |
| 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') |
| 500 (or (vc-file-getprop file 'vc-state) | 503 (or (vc-file-getprop file 'vc-state) |
| 501 (if (and (> (length file) 0) (vc-backend file)) | 504 (if (and (> (length file) 0) (vc-backend file)) |