[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bug#8025: 24.0.50; vc-bzr does not perform initial commit
From: |
Glenn Morris |
Subject: |
Re: bug#8025: 24.0.50; vc-bzr does not perform initial commit |
Date: |
Tue, 01 Mar 2011 23:03:03 -0500 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Very lightly tested patch. Seems like not all of the fields are present
in a freshly minted repo.
*** lisp/vc/vc-bzr.el 2011-02-19 21:23:51 +0000
--- lisp/vc/vc-bzr.el 2011-03-02 03:58:40 +0000
***************
*** 210,222 ****
;; was executable the last time bzr checked?
"[^\0]*\0"
"[^\0]*\0" ;?
! "\\([^\0]*\\)\0" ;"a/f/d" a=added?
"\\([^\0]*\\)\0" ;sha1 again?
"\\([^\0]*\\)\0" ;size again?
;; y/n. Whether or not the repo thinks
;; the file should be executable?
"\\([^\0]*\\)\0"
! "[^\0]*\0" ;last revid?
;; There are more fields when merges are
pending.
)
nil t)
--- 210,222 ----
;; was executable the last time bzr checked?
"[^\0]*\0"
"[^\0]*\0" ;?
! "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added?
"\\([^\0]*\\)\0" ;sha1 again?
"\\([^\0]*\\)\0" ;size again?
;; y/n. Whether or not the repo thinks
;; the file should be executable?
"\\([^\0]*\\)\0"
! "[^\0]*\0\\)?" ;last revid?
;; There are more fields when merges are
pending.
)
nil t)
***************
*** 225,230 ****
--- 225,231 ----
;; first size seems to correspond to the file with
;; conflict markers).
(cond
+ ((not (match-beginning 4)) 'added)
((eq (char-after (match-beginning 1)) ?a) 'removed)
((eq (char-after (match-beginning 4)) ?a) 'added)
((or (and (eq (string-to-number (match-string 3))
Re: bug#8025: 24.0.50; vc-bzr does not perform initial commit, Stefan Monnier, 2011/03/02