From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Christoph Scholtes <cschol2112@googlemail.com>,
8025@debbugs.gnu.org, emacs-devel@gnu.org
Subject: bug#8025: 24.0.50; vc-bzr does not perform initial commit
Date: Tue, 01 Mar 2011 23:03:03 -0500 [thread overview]
Message-ID: <p1mxle2mq0.fsf__17507.637551944$1299038819$gmane$org@fencepost.gnu.org> (raw)
In-Reply-To: <xc8vwyfba5.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 01 Mar 2011 22:31:46 -0500")
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))
next prev parent reply other threads:[~2011-03-02 4:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-12 19:18 bug#8025: 24.0.50; vc-bzr does not perform initial commit Christoph
2011-02-12 19:58 ` Christoph
2011-02-12 20:51 ` Eli Zaretskii
2011-02-12 20:56 ` Christoph
2011-03-01 16:19 ` Christoph Scholtes
[not found] ` <4D6D1CA3.4050307@gmail.com>
2011-03-01 18:42 ` Eli Zaretskii
2011-03-02 3:31 ` Glenn Morris
2011-03-02 5:55 ` Christoph Scholtes
[not found] ` <xc8vwyfba5.fsf@fencepost.gnu.org>
2011-03-02 4:03 ` Glenn Morris [this message]
2011-03-02 6:00 ` Christoph Scholtes
[not found] ` <p1mxle2mq0.fsf@fencepost.gnu.org>
2011-03-02 6:16 ` Christoph Scholtes
[not found] ` <86d3macb9l.fsf@gmail.com>
2011-03-02 18:34 ` Eli Zaretskii
[not found] ` <86hbbmcbh9.fsf@gmail.com>
2011-03-02 18:32 ` Eli Zaretskii
2011-03-02 17:10 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='p1mxle2mq0.fsf__17507.637551944$1299038819$gmane$org@fencepost.gnu.org' \
--to=rgm@gnu.org \
--cc=8025@debbugs.gnu.org \
--cc=cschol2112@googlemail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).