Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b9236874
Commit
b9236874
authored
Jan 29, 2010
by
Dan Nicolaescu
Browse files
(vc-bzr-after-dir-status): Match another renaming indicator.
parent
c14902e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+2
-1
No files found.
lisp/ChangeLog
View file @
b9236874
2010-01-29 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Match another renaming indicator.
2010-01-29 Chong Yidong <cyd@stupidchicken.com>
* dirtrack.el (dirtrack): Warn instead of signalling error if the
...
...
lisp/vc-bzr.el
View file @
b9236874
...
...
@@ -679,6 +679,7 @@ stream. Standard error output is discarded."
("
?
" . unregistered)
;; No such state, but we need to distinguish this case.
("
R
" . renamed)
("
RM
" . renamed)
;; For a non existent file FOO, the output is:
;; bzr: ERROR: Path(s) do not exist: FOO
("
bzr
" . not-found)
...
...
@@ -713,7 +714,7 @@ stream. Standard error output is discarded."
(when entry
(setf (nth 1 entry) 'conflict))))
((eq translated 'renamed)
(re-search-forward "
R
\\
(
.
*\\
)
=>
\\
(
.
*\\
)
$
" (line-end-position) t)
(re-search-forward "
R
[
M]
\\
(
.
*\\
)
=>
\\
(
.
*\\
)
$
" (line-end-position) t)
(let ((new-name (file-relative-name (match-string 2) relative-dir))
(old-name (file-relative-name (match-string 1) relative-dir)))
(push (list new-name 'edited
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment