Mercurial > emacs

annotate .cvsignore @ 93956:bfc762f0b49c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* vc-hooks.el (vc-state): Add new state `conflict'. (vc-after-save): Use when not if. (vc-default-mode-line-string): Deal with the conflict state. (vc-prefix-map): (vc-menu-map): Bind vc-status instead of vc-directory. * vc.el (vc-editable-p): (vc-default-status-printer): (vc-next-action): Deal with the conflict state. (vc-mark-resolved): New function. (vc-status-mode): Fix mode name. (vc-default-comment-history): Use when not if. (Todo): Add new entries, remove old ones. * vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state. (vc-cvs-parse-status): (vc-cvs-after-dir-status): * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): Detect the conflict state.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 10 Apr 2008 07:32:25 +0000
parents 661046481c02
children 787b888abdea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27634
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 25839
diff changeset
1 bin
28195
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
2 boot.log
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
3 boot.log.diff
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
4 boot.log.old
90718
f1d13e615070 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 64721
diff changeset
5 update.log
31816
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
6 config.log
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
7 config.status
90718
f1d13e615070 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 64721
diff changeset
8 config.cache
f1d13e615070 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 64721
diff changeset
9 Makefile
31816
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
10 emacs*.tar.gz
35744
497c28f292c4 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 31816
diff changeset
11 leim*.tar.gz
64721
eeb74924d896 Add `lock'.
Juanma Barranquero <lekktu@gmail.com>
parents: 64658
diff changeset
12 lock
90718
f1d13e615070 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 64721
diff changeset
13 *.xdelta
f1d13e615070 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 64721
diff changeset
14 autom4te.cache
90925
e55f1991b80c Add data and site-lisp.
Juanma Barranquero <lekktu@gmail.com>
parents: 90718
diff changeset
15 site-lisp
e55f1991b80c Add data and site-lisp.
Juanma Barranquero <lekktu@gmail.com>
parents: 90718
diff changeset
16 data