From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: bug#8025: 24.0.50; vc-bzr does not perform initial commit Date: Tue, 01 Mar 2011 23:03:03 -0500 Message-ID: References: <86hbc9yscs.fsf@gmail.com> <4D6D1CA3.4050307@gmail.com> <83zkpey962.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1299038599 18986 80.91.229.12 (2 Mar 2011 04:03:19 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 2 Mar 2011 04:03:19 +0000 (UTC) Cc: Christoph Scholtes , 8025@debbugs.gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 02 05:03:14 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PudHM-0004do-0H for ged-emacs-devel@m.gmane.org; Wed, 02 Mar 2011 05:03:12 +0100 Original-Received: from localhost ([127.0.0.1]:34120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PudHL-0003q6-6T for ged-emacs-devel@m.gmane.org; Tue, 01 Mar 2011 23:03:11 -0500 Original-Received: from [140.186.70.92] (port=38763 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PudHF-0003ng-LB for emacs-devel@gnu.org; Tue, 01 Mar 2011 23:03:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PudHE-0004AN-Pf for emacs-devel@gnu.org; Tue, 01 Mar 2011 23:03:05 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:58263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PudHE-0004AE-IG for emacs-devel@gnu.org; Tue, 01 Mar 2011 23:03:04 -0500 Original-Received: from localhost ([127.0.0.1]:58147) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PudHE-0002DY-1e; Tue, 01 Mar 2011 23:03:04 -0500 X-Spook: ARPA Capricorn enemy of the state Abu Ghraib constitution X-Ran: T+Qd}YjuotqRaxHT@i+/x<"dn4khJC}nV0)i(d8y$hs=52WRYp!ca1q"9e=Lbe_Jx{u"(Q X-Hue: green X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Tue, 01 Mar 2011 22:31:46 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:136701 Archived-At: 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))