From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr) Date: Fri, 28 Sep 2012 09:27:11 +0200 Message-ID: <83ehlmhak0.fsf@gnu.org> References: <87ehln6s9l.fsf@bzg.ath.cx> <87d317rs5p.fsf@bzg.ath.cx> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1348817272 25925 80.91.229.3 (28 Sep 2012 07:27:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Sep 2012 07:27:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 28 09:27:57 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 1THUzE-0008Ar-3N for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 09:27:48 +0200 Original-Received: from localhost ([::1]:41460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THUz8-0007VB-JW for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 03:27:42 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THUz6-0007Ux-2B for emacs-devel@gnu.org; Fri, 28 Sep 2012 03:27:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THUz4-0006V1-Mr for emacs-devel@gnu.org; Fri, 28 Sep 2012 03:27:39 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:43607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THUyx-0006P0-SI; Fri, 28 Sep 2012 03:27:32 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MB100K00TGB4W00@a-mtaout22.012.net.il>; Fri, 28 Sep 2012 09:27:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MB100J1OU19FQU0@a-mtaout22.012.net.il>; Fri, 28 Sep 2012 09:27:09 +0200 (IST) In-reply-to: <87d317rs5p.fsf@bzg.ath.cx> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:153658 Archived-At: > From: Bastien > Date: Fri, 28 Sep 2012 00:56:50 +0200 > Cc: emacs-devel@gnu.org > > 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.