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: emacs-w3m? Date: Fri, 26 Feb 2010 19:35:40 +0200 Message-ID: <83k4tzlx1v.fsf@gnu.org> References: <3E1D063D-AC8A-4E40-B9F8-6ACA5089C4A7@gmail.com> <873a0p1dqt.fsf@telefonica.net> <87r5o9yr4y.fsf@telefonica.net> <87mxywzx2r.fsf@telefonica.net> <83zl2wl5i9.fsf@gnu.org> <83ocjckq2d.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1267206329 23012 80.91.229.12 (26 Feb 2010 17:45:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 26 Feb 2010 17:45:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: bob@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 26 18:45:24 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 1Nl4Fg-0007N1-7k for ged-emacs-devel@m.gmane.org; Fri, 26 Feb 2010 18:45:24 +0100 Original-Received: from localhost ([127.0.0.1]:33936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nl4Ff-0004QQ-M1 for ged-emacs-devel@m.gmane.org; Fri, 26 Feb 2010 12:45:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nl46u-0006hX-8z for emacs-devel@gnu.org; Fri, 26 Feb 2010 12:36:20 -0500 Original-Received: from [140.186.70.92] (port=52910 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nl46t-0006h7-8z for emacs-devel@gnu.org; Fri, 26 Feb 2010 12:36:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nl46s-0000Q8-7V for emacs-devel@gnu.org; Fri, 26 Feb 2010 12:36:19 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:49633) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nl46q-0000PO-03; Fri, 26 Feb 2010 12:36:16 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KYG00800LQPD200@a-mtaout21.012.net.il>; Fri, 26 Feb 2010 19:35:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.246.192]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KYG007CLM79S720@a-mtaout21.012.net.il>; Fri, 26 Feb 2010 19:35:34 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:121401 Archived-At: > Cc: ofv@wanadoo.es, emacs-devel@gnu.org > From: bob@gnu.org (Robert J. Chassell) > Date: Fri, 26 Feb 2010 11:59:34 -0500 > > I think you should search earlier in your .bzr.log for a command that > inadvertently merged emacs-w3m with the trunk. When do you see for > the first time files with any of the .OTHER, .BASE, and .THIS > suffixes? That's where the problem began, I think. > > No, the first appearance of emacs-w3m is when I mistakenly committed to > the master on Wed 2010-02-24 22:07:19 +0000. I did an iseach and occur > using both emacs-w3m and OTHER and did not find anything earlier. In this fragment of your log, which shows your commit which added emacs-w3m to the public repository, where did the `share' directory come from? > Wed 2010-02-24 22:07:19 +0000 > 0.161 bzr arguments: [u'commit', u'-m', u'Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information'] > 0.219 looking for plugins in /home/bob/.bazaar/plugins > 0.220 looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins > 0.640 encoding stdout as sys.stdout encoding 'ISO-8859-1' > 0.841 opening working tree '/usr/local/src/emacs/trunk' > 1.240 bzr-svn: using Subversion 1.6.9 () > 1.334 ssh implementation is OpenSSH > 4.029 preparing to commit > [16788] 2010-02-24 22:07:26.190 INFO: Committing to: sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/ > 6.663 Selecting files for commit with filter None > [16788] 2010-02-24 22:07:26.368 INFO: modified configure > [16788] 2010-02-24 22:07:26.370 INFO: missing configure.BASE > [16788] 2010-02-24 22:07:26.371 INFO: missing configure.OTHER > [16788] 2010-02-24 22:07:26.373 INFO: missing configure.THIS > [16788] 2010-02-24 22:07:26.440 INFO: added log-n0.out > [16788] 2010-02-24 22:07:26.457 INFO: added share > [16788] 2010-02-24 22:07:27.382 INFO: modified doc/lispintro/emacs-lisp-intro.texi > [16788] 2010-02-24 22:07:40.696 INFO: added share/emacs > [16788] 2010-02-24 22:07:40.697 INFO: added share/info > [16788] 2010-02-24 22:07:40.700 INFO: added share/emacs/site-lisp > [16788] 2010-02-24 22:07:40.702 INFO: added share/emacs/site-lisp/w3m > [16788] 2010-02-24 22:07:40.730 INFO: added share/emacs/site-lisp/w3m/ChangeLog > [16788] 2010-02-24 22:07:40.732 INFO: added share/emacs/site-lisp/w3m/ChangeLog.1 How did the directory `share' get created in the trunk working tree?