Mercurial > emacs
comparison lisp/vc-hooks.el @ 91304:c938ab6810a4
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-308
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 02 Jan 2008 04:13:39 +0000 |
parents | 56a72e2bd635 b5060e79eb98 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91303:1ae1f4066439 | 91304:c938ab6810a4 |
---|---|
501 | 501 |
502 'added Scheduled to go into the repository on the next commit. | 502 'added Scheduled to go into the repository on the next commit. |
503 Often represented by vc-working-revision = \"0\" in VCSes | 503 Often represented by vc-working-revision = \"0\" in VCSes |
504 with monotonic IDs like Subversion and Mercurial. | 504 with monotonic IDs like Subversion and Mercurial. |
505 | 505 |
506 'ignored The file showed up in a dir-state listing with a flag | 506 'removed Scheduled to be deleted from the repository on next commit. |
507 | |
508 'ignored The file showed up in a dir-state listing with a flag | |
507 indicating the version-control system is ignoring it, | 509 indicating the version-control system is ignoring it, |
508 Note: This property is not set reliably (some VCSes | 510 Note: This property is not set reliably (some VCSes |
509 don't have useful directory-status commands) so assume | 511 don't have useful directory-status commands) so assume |
510 that any file with vc-state nil might be ignorable | 512 that any file with vc-state nil might be ignorable |
511 without VC knowing it. | 513 without VC knowing it. |
512 | 514 |
513 'unregistered The file showed up in a dir-state listing with a flag | 515 'unregistered The file showed up in a dir-state listing with a flag |
514 indicating that it is not under version control. | 516 indicating that it is not under version control. |
515 Note: This property is not set reliably (some VCSes | 517 Note: This property is not set reliably (some VCSes |
516 don't have useful directory-status commands) so assume | 518 don't have useful directory-status commands) so assume |
517 that any file with vc-state nil might be unregistered | 519 that any file with vc-state nil might be unregistered |
518 without VC knowing it. | 520 without VC knowing it. |