Re: emacs-w3m?

[Eli Zaretskii]

> Cc: address@hidden, address@hidden
> From: address@hidden (Robert J. Chassell)
> Date: Fri, 26 Feb 2010 06:47:47 -0500
> 
>     ... in your ~/.bzr.log file you will find the
>     full log of all the Bazaar commands ...
> 
> I had not realized that.  I gave an `add' command but not on the same
> day.  It was several days before, on Saturday, the 20th, rather than on
> Wednesday, the 24th!  I also have a Python problem for a non-existent
> file but that is marked resolved.  (I got Python from Debian and have
> not changed it.)  All I did on 24 February was update, merge, resolve,
> and commit.

I'm not an expert, but it looks like something else is at work here.
See below.

> I have both a quickfixes/ directory which is a branch off of trunk where
> I made the change to `Introduction to Programming in Emacs Lisp' and a
> trunk/, which is the only branch connected to
> sftp://address@hidden/srv/bzr/emacs/trunk.

Maybe you should describe your day-to-day routine workflow with making
changes, because the log you posted has some weird entries (or maybe
I'm not interpreting it correctly).

> I also have a Python problem for a non-existent file but that is
> marked resolved.

I don't see any Python problem.  If you mean this:

> 13.362  Traceback (most recent call last):
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in 
> exception_to_return_code
>     return the_callable(*args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in 
> run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in 
> run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 659, in run
>     no_recurse, action=action, save=not dry_run)
>   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 53, in 
> tree_write_locked
>     return unbound(self, *args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 399, in 
> smart_add
>     kind = osutils.file_kind(abspath)
>   File "/usr/lib/python2.5/site-packages/bzrlib/osutils.py", line 1801, in 
> file_kind
>     raise errors.NoSuchFile(f)
> NoSuchFile: No such file: u'/usr/local/src/emacs/trunk/lisp/ChangeLog.OTHER'
> 
> 13.363  return code 3

Then it's just a symptom of a larger disaster.  All it says is that
you did a "bzr add" for a file that did not exist.

Btw, why did you use "bzr add" in this case?  That command exists only
for adding new files.  Why did you think you had some new file to add
on your end?

> Sat 2010-02-20 12:18:25 +0000
> 0.195  bzr arguments: [u'add', u'lisp/ChangeLog.OTHER', 
> u'--file-ids-from=sftp://address@hidden/srv/bzr/emacs/trunk/']

Why did you use the --file-ids-from= option here?  That's hardly
something a simple workflow should include.

Anyway, AFAIK, this cannot be the culprit: it only tries to add a
single file, lisp/ChangeLog.OTHER.  However, the mere presence of the
.OTHER file, and also other similar files:

> [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

is by itself an evidence that you have conflicts in your working tree
that you didn't resolve in time.  I'm guessing that somehow emacs-w3m
got merged with the trunk, because these .BASE, .THIS, and .OTHER
files are created by Bazaar when it detects conflicts during a merge.

Look here, for example:

> Sun 2010-02-21 10:51:07 +0000
> 0.995  bzr arguments: [u'merge']
> 1.166  looking for plugins in /home/bob/.bazaar/plugins
> 1.167  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
> 7.990  opening working tree '/usr/local/src/emacs/quickfixes'
> 10.902  file:///usr/local/src/emacs/trunk/
> [ 5375] 2010-02-21 10:51:18.883 INFO: Merging from remembered parent location 
> /usr/local/src/emacs/trunk/
> 14.384  Base revid: 'address@hidden'
> [ 5375] 2010-02-21 10:51:28.701 INFO: +N  lisp/ChangeLog.OTHER
> [ 5375] 2010-02-21 10:51:28.702 INFO:  M  lib-src/ChangeLog
> [ 5375] 2010-02-21 10:51:28.704 INFO:  M  lib-src/etags.c
> [ 5375] 2010-02-21 10:51:28.704 INFO:  M  lisp/progmodes/compile.el
> [ 5375] 2010-02-21 10:51:28.710 WARNING: Contents conflict in lisp/ChangeLog
> [ 5375] 2010-02-21 10:51:28.722 WARNING: Conflict adding file 
> lisp/ChangeLog.OTHER.  Moved existing file to lisp/ChangeLog.OTHER.moved.
> [ 5375] 2010-02-21 10:51:28.939 INFO: 2 conflicts encountered.
> 143.756  return code 1

Those messages about conflicts were surely displayed to you -- did you
see them?  You should have taken care of these conflicts right away.

Or this:

> Sun 2010-02-21 10:53:55 +0000
> 1.237  bzr arguments: [u'remove', u'lisable(*args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in 
> run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in 
> run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in 
> run
>     raise errors.BzrCommandError('Conflicts detected in working '
> BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to 
> list, "bzr resolve FILE" to resolve.

You were supposed to resolve the conflicts, but I don't see any signs
that they were resolved.

> Mon 2010-02-22 11:05:52 +0000
> 0.681  bzr arguments: [u'merge']
> 0.873  looking for plugins in /home/bob/.bazaar/plugins
> 0.873  looking for plugins in 
> /usr/lib/python2.5/site-packagocal/src/emacs/trunk/
> [15662] 2010-02-22 11:05:57.438 INFO: Merging from remembered parent location 
> /usr/local/src/emacs/trunk/
> 6.505  Base revid: 'address@hidden'
> [15662] 2010-02-22 11:06:06.213 INFO: +N  lisp/ChangeLog.OTHER
> [15662] 2010-02-22 11:06:06.214 INFO:  M  doc/emacs/ChangeLog
> [15662] 2010-02-22 11:06:06.215 INFO:  M  doc/emacs/frames.texi
> [15662] 2010-02-22 11:06:06.216 INFO:  M  lisp/eshell/eshell.el
> [15662] 2010-02-22 11:06:06.217 INFO:  M  lisp/files.el
> [15662] 2010-02-22 11:06:06.218 INFO:  M  lisp/htmlfontify.el
> [15662] 2010-02-22 11:06:06.219 INFO:  M  lisp/startup.el
> [15662] 2010-02-22 11:06:06.220 INFO:  M  src/ChangeLog
> [15662] 2010-02-22 11:06:06.221 INFO:  M  src/m/arm.h
> [15662] 2010-02-22 11:06:06.222 WARNING: Contents conflict in lisp/ChangeLog
> [15662] 2010-02-22 11:06:06.664 INFO: 1 conflicts encountered.
> 91.823  return code 1
> 
> Mon 2010-02-22 11:09:00 +0000
> 0.208  bzr arguments: [u'resolve', u'lisp/ChangeLog']
> 0.277  looking for plugins in /home/bob/.bazaar/plugins
> 0.278  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
> 0.793  encoding stdout as sys.stdout encoding 'ISO-8859-1'
> 1.034  opening working tree '/usr/local/src/emacs/quickfixes'
> 1.216  return code 0

It doesn't help using "bzr resolve" if you don't resolve the conflicts
before that.  The resolution is a manual job.  It looks to me that
Bazaar displayed warning and error messages about conflicts time and
again, but you did not resolve the conflicts correctly.  You should
have asked for help right there and then.

And it is certainly a no-no to commit to the public repository when
you have a tree of dubious quality, one where you get error messages
about conflicts you cannot explain.

> Then later, I invoked `bzr help remove' (presumably, I learned that I
> had inadvertently added W3M mode files to the master copy) but have
> not done any removes.

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.