From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Emacs trunk Date: Fri, 03 Dec 2010 17:07:44 -0500 Message-ID: References: <87lj467lme.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1291414115 19849 80.91.229.12 (3 Dec 2010 22:08:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Dec 2010 22:08:35 +0000 (UTC) Cc: Katsumi Yamaoka , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 03 23:08:31 2010 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 1POdnn-0005ng-Qc for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 23:08:27 +0100 Original-Received: from localhost ([127.0.0.1]:46631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POdnn-00028K-BS for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 17:08:27 -0500 Original-Received: from [140.186.70.92] (port=40635 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POdni-00027A-Qp for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:08:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POdnh-0002oQ-Md for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:08:22 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:45706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POdnh-0002mx-GS for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:08:21 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id oB3M7m4Z001415; Fri, 3 Dec 2010 17:07:48 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 0D097A8364; Fri, 3 Dec 2010 17:07:44 -0500 (EST) In-Reply-To: <87lj467lme.fsf@stupidchicken.com> (Chong Yidong's message of "Fri, 03 Dec 2010 13:32:41 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3698=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:133360 Archived-At: >> I seem to have deleted some files in the Emacs bzr trunk for >> unresolved reason at revno:102572 . I restored those files, >> but I might have done it in a wrong way. Sorry. >> >> At that time I merged Gnus changes to the Emacs trunk as usual, >> never did unusual operation. Hmm.. > You dropped the exec bit on several of the files. I've put them back, > but could you double check? In particular, check that all the files you > deleted and then restored have the correct permissions. He also gave them different file-ids. So we should re-remove them and then re-add them with "bzr add --file-ids-from" some older branch. Or maybe just with something like "bzr merge -r 102572..102571". Stefan