Weird failure of a merge to local branch

[Eli Zaretskii]

> From: vila <v.ladeuil+lp at free.fr>
> Cc: bazaar at lists.canonical.com
> Date: Sat, 04 Dec 2010 13:33:17 +0100
> 
> >>>>> Eli Zaretskii <eliz at gnu.org> writes:
> 
>     > Merging from a bound branch to one of my local branches failed with an
>     > error message I never saw before:
> 
>     >   bzr: ERROR: [Error 5] Access is denied:
>     >   u'D:/gnu/bzr/emacs/djgpp/.bzr/checkout/pending-deletion\\new-105'
> 
> This is a fallout from a previous failed command, can you find the
> relevant part in your .bzr.log ?

There is no previous failed command, this command is the first one
that failed.  The previous one (in the same branch) was "bzr status",
and it succeeded (unless I'm missing something):

  Sat 2010-12-04 11:36:46 +0200
  0.125  bazaar version: 2.2.1
  0.125  bzr arguments: [u'status']
  0.140  looking for plugins in C:/Documents and Settings/Zaretzky/Application Data/bazaar/2.0/plugins
  0.140  looking for plugins in D:/usr/Bazaar/plugins
  0.390  encoding stdout as sys.stdout encoding 'cp1252'
  0.500  opening working tree 'D:/gnu/bzr/emacs/djgpp'
  0.547  check paths: None
  1.609  encoding stdout as sys.stdout encoding 'cp1252'
  1.609  Transferred: 0kB (0.0kB/s r:0kB w:0kB)
  1.609  return code 0

The failed command was "bzr merge --pull", issued 7 seconds later:

  Sat 2010-12-04 11:36:53 +0200
  0.125  bazaar version: 2.2.1
  0.125  bzr arguments: [u'merge', u'--pull']
  0.141  looking for plugins in C:/Documents and Settings/Zaretzky/Application Data/bazaar/2.0/plugins
  0.157  looking for plugins in D:/usr/Bazaar/plugins
  0.547  encoding stdout as sys.stdout encoding 'cp1252'
  0.625  opening working tree 'D:/gnu/bzr/emacs/djgpp'
  0.828  file:///D:/gnu/bzr/emacs/trunk/
  [ 5108] 2010-12-04 11:36:53.921 INFO: Merging from remembered parent location D:/gnu/bzr/emacs/trunk/
  1.719  Base revid: 'eliz at gnu.org-20101126183840-k65v5jvyq6d933j8'
  21.094  Cleanup failed:
  21.094  Traceback (most recent call last):
    File "bzrlib\cleanup.pyo", line 66, in _run_cleanup
    File "bzrlib\transform.pyo", line 1136, in finalize
  ImmortalPendingDeletion: Unable to delete transform temporary directory D:/gnu/bzr/emacs/djgpp/.bzr/checkout/pending-deletion.  Please examine D:/gnu/bzr/emacs/djgpp/.bzr/checkout/pending-deletion to see if it contains any files you wish to keep, and delete it when you are done.

>     > This branch exists for almost a year, and I merge from it and into it
>     > almost every week, without any problems till now.  The full
>     > information from .bzr.log is at the end of this message.
> 
>     > Running "bzr status" after the failed merge says:
> 
>     >   working tree is out of date, run 'bzr update'
> 
>     > and proceeds to show a long list of removed and modified files.
> 
> Typical result of an out-of-sync working tree with its basis branch.

I don't understand how could it get out of sync.  The previous command
in the parent branch ("trunk", bound to remote repository) was "bzr up", 
and it succeeded.  The previous command in this branch ("djgpp") was
"bzr ci", which was successful, and then I merged from "djgpp" to the
trunk, also successfully.

> Could it be that a bzr command was interrupted in  a rude way (including
> a crash or a several ctrl-C) ?

Not anywhere near that failed merge command.

>     >   ImmortalPendingDeletion: Unable to delete transform temporary directory D:/gnu/bzr/emacs/djgpp/.bzr/checkout/pending-deletion.  Please examine D:/gnu/bzr/emacs/djgpp/.bzr/checkout/pending-deletion to see if it contains any files you wish to keep, and delete it when you are done.
> 
> So this should be the result of an *older* failed command which may be a
> bug you want to report, all the rest of the symptoms are fallouts.

Except that I find no failed commands.  Hmmm...  Actually, there is
one:

  Mon 2010-11-29 07:13:03 +0200
  0.157  bazaar version: 2.2.1
  0.157  bzr arguments: [u'index']
  0.172  looking for plugins in C:/Documents and Settings/Zaretzky/Application Data/bazaar/2.0/plugins
  0.172  looking for plugins in D:/usr/Bazaar/plugins
  0.532  encoding stdout as sys.stdin encoding 'cp862'
  164.578  Traceback (most recent call last):
    File "bzrlib\commands.pyo", line 912, in exception_to_return_code
    File "bzrlib\commands.pyo", line 1112, in run_bzr
    File "bzrlib\commands.pyo", line 690, in run_argv_aliases
    File "bzrlib\commands.pyo", line 705, in run
    File "bzrlib\cleanup.pyo", line 135, in run_simple
    File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
    File "D:/usr/Bazaar/plugins\search\commands.py", line 41, in run
    File "D:/usr/Bazaar/plugins\search\index.py", line 150, in index_url
    File "D:/usr/Bazaar/plugins\search\index.py", line 321, in index_branch
    File "D:/usr/Bazaar/plugins\search\index.py", line 336, in index_revisions
    File "D:/usr/Bazaar/plugins\search\index.py", line 384, in _index_revisions
    File "D:/usr/Bazaar/plugins\search\index.py", line 399, in _add_index
  Exception: md5 collision! rad! e92ab46d537bf4d3ab311348d34a0e4a

  164.578  couldn't find apport bug-reporting library: No module named apport
  164.641  Traceback (most recent call last):
    File "bzrlib\plugin.pyo", line 542, in _get__version__
    File "bzrlib\lazy_import.pyo", line 125, in __call__
    File "bzrlib\__init__.pyo", line 117, in _format_version_tuple
  ValueError: version_info (1, 1, 0, 'pre', 0) not valid

  164.641  return code 4

This comes from "bzr index", which gets run once a week in the "trunk"
branch.  But the log shows that these crashes of "bzr index" started
happening more than a month before the failed merge, and during that
time I did any number of similar merges, without any trouble.

Thanks.