aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-12-29 05:54:23 +0000
committerDan Nicolaescu2007-12-29 05:54:23 +0000
commit85933f0aefcef3852e96b15c518f5ad5d46ac2ea (patch)
tree1925cdaa2dde743012f622baed4fbc5e72d41523
parent13eb7df084c191316e1fe4e65a92ceeb1bb08f41 (diff)
downloademacs-85933f0aefcef3852e96b15c518f5ad5d46ac2ea.tar.gz
emacs-85933f0aefcef3852e96b15c518f5ad5d46ac2ea.zip
(vc-hg-dir-state): Deal with the up-to-date state.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hg.el2
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20e1d0a224b..a879da74a68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-12-29 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-hg.el (vc-hg-dir-state): Deal with the up-to-date state.
4
12007-12-29 Jay Belanger <jay.p.belanger@gmail.com> 52007-12-29 Jay Belanger <jay.p.belanger@gmail.com>
2 6
3 * calc/calc-aent.el (math-read-token): Fix misplaced 7 * calc/calc-aent.el (math-read-token): Fix misplaced
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 41cc883c0a4..b3482ddffae 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -199,6 +199,8 @@
199 ;; ! = deleted, but still tracked 199 ;; ! = deleted, but still tracked
200 ;; should not show up in vc-dired, so don't deal with them 200 ;; should not show up in vc-dired, so don't deal with them
201 ;; here. 201 ;; here.
202 ((eq status-char ?C)
203 (vc-file-setprop file 'vc-state 'up-to-date))
202 ((eq status-char ?A) 204 ((eq status-char ?A)
203 (vc-file-setprop file 'vc-working-revision "0") 205 (vc-file-setprop file 'vc-working-revision "0")
204 (vc-file-setprop file 'vc-state 'edited)) 206 (vc-file-setprop file 'vc-state 'edited))