From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr) Date: Fri, 28 Sep 2012 09:36:24 +0200 Message-ID: <87lifuk39j.fsf@bzg.ath.cx> References: <87ehln6s9l.fsf@bzg.ath.cx> <87d317rs5p.fsf@bzg.ath.cx> <83ehlmhak0.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348817799 30083 80.91.229.3 (28 Sep 2012 07:36:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Sep 2012 07:36:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 28 09:36:45 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1THV7t-0003sM-2A for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 09:36:45 +0200 Original-Received: from localhost ([::1]:46289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THV7n-0002OQ-TH for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 03:36:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THV7i-0002OH-M7 for emacs-devel@gnu.org; Fri, 28 Sep 2012 03:36:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THV7e-00012L-R9 for emacs-devel@gnu.org; Fri, 28 Sep 2012 03:36:34 -0400 Original-Received: from mail-wi0-f171.google.com ([209.85.212.171]:36280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THV7W-00010A-JP; Fri, 28 Sep 2012 03:36:22 -0400 Original-Received: by wibhj13 with SMTP id hj13so3612000wib.12 for ; Fri, 28 Sep 2012 00:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=i/wfXHTpzodb58W17PweirkQ99dyH0sBpULzzLYd++I=; b=lhirk1sVOw0EOD1U9U7aLFjj0ZwjiJXP7ubONE5SCOxjPZ/Acve3LxdWSrdx8bWjLI iUUk+n7D9sz6U4S6DQ1Y73Biz91xLOcA0rlWyqLncczQUr+e9B4HogXmUxPAP2nUzEh3 1cQlGqhDOXHp6150XWBcK68OqaLrGsXRvTGoYiKghQSFkVIZ64J3Y6ejXeEcf51yhRnD t1coN+n5ByzarNby8QI3xFMqox1y/H0MIMMwIhY+Pq9eMhSJkyZyloCpVAkGgaBENMtJ xllpZS2Uwp13Fnp/tmEmworjAPcLOatSmkHaBMoxAKz3WQsA75fWqNRQCRGtR0+DHcFc Cnhg== Original-Received: by 10.180.80.134 with SMTP id r6mr1961513wix.1.1348817781621; Fri, 28 Sep 2012 00:36:21 -0700 (PDT) Original-Received: from bzg.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPS id k2sm17774811wiz.7.2012.09.28.00.36.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 00:36:20 -0700 (PDT) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 10DB122EDA; Fri, 28 Sep 2012 09:36:24 +0200 (CEST) In-Reply-To: <83ehlmhak0.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 28 Sep 2012 09:27:11 +0200") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.171 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:153659 Archived-At: Eli Zaretskii writes: >> Glenn Morris writes: >> >> > Bastien wrote: >> > >> >> There is this merge conflict indication in dired.el >> >> which prevents Emacs from building: >> > >> > That is local to your copy. >> >> Indeed. No idea how this ended up here. > > Probably like this: > > . "bzr up" > . build Emacs, which changed dired.el due to autoloads > . "bzr up", which brought in dired.el where the same autoloads were > already updated, but the time stamp was different. Bzr told you > that there text conflicts, but you didn't notice that. > > In general, it is advisable to run "bzr st" from time to time, > preferably after the build that you do after "bzr up", to see if any > versioned files changed due to autoloads. If some of them did, either > commit those files (preferred), or "bzr revert" and rebuild, then wait > for someone else to commit the modified autoloads. Thanks for the info Eli, will check this when I build again. -- Bastien