Mercurial > emacs
comparison lisp/vc/vc-svn.el @ 109409:ff42e5c5f789
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 16 Jun 2010 22:49:55 +0000 |
| parents | e93288477c43 6c39bda25895 |
| children | 1b626601d32d |
comparison
equal
deleted
inserted
replaced
| 109408:4eded71f4215 | 109409:ff42e5c5f789 |
|---|---|
| 168 (?D . removed) | 168 (?D . removed) |
| 169 (?R . removed) | 169 (?R . removed) |
| 170 (?? . unregistered) | 170 (?? . unregistered) |
| 171 ;; This is what vc-svn-parse-status does. | 171 ;; This is what vc-svn-parse-status does. |
| 172 (?~ . edited))) | 172 (?~ . edited))) |
| 173 (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" | 173 (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" |
| 174 ;; Subexp 2 is a dummy in this case, so the numbers match. | 174 ;; Subexp 2 is a dummy in this case, so the numbers match. |
| 175 "^\\(.\\)....\\(.\\) \\(.*\\)$")) | 175 "^\\(.\\)....\\(.\\) \\(.*\\)$")) |
| 176 result) | 176 result) |
| 177 (goto-char (point-min)) | 177 (goto-char (point-min)) |
| 178 (while (re-search-forward re nil t) | 178 (while (re-search-forward re nil t) |