emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: emacs-w3m?


From: Eli Zaretskii
Subject: Re: emacs-w3m?
Date: Fri, 26 Feb 2010 19:35:40 +0200

> Cc: address@hidden, address@hidden
> From: address@hidden (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://address@hidden/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?




reply via email to

[Prev in Thread] Current Thread [Next in Thread]