[Bug 340726] Re: Daily autocommits lead to frequent conflicts

Chris Conway cconway at cs.nyu.edu
Mon Mar 23 14:56:48 UTC 2009


Thierry, I will try to reproduce the problem and let you know. Here's an
example stack trace from .bzr.log:

Fri 2009-02-27 09:49:54 -0500
0.018  bzr arguments: [u'commit', u'-m', u'saving uncommitted changes in /etc prior to apt run']
0.026  looking for plugins in /home/chris/.bazaar/plugins
0.090  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.161  encoding stdout as sys.stdout encoding 'UTF-8'
0.216  opening working tree '/etc'
0.734  preparing to commit
0.873  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 896, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 542, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2698, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 224, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 208, in commit
    *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 303, in commit
    old_revno, new_revno = self._check_out_of_date_tree()
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 509, in _check_out_of_date_tree
    raise errors.OutOfDateTree(self.work_tree)
OutOfDateTree: Working tree is out of date, please run 'bzr update'.

$ bzr --version
Bazaar (bzr) 1.12
  Python interpreter: /usr/bin/python 2.5.2
  Python standard library: /usr/lib/python2.5
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/chris/.bazaar
  Bazaar log file: /home/chris/.bzr.log

-- 
Daily autocommits lead to frequent conflicts
https://bugs.launchpad.net/bugs/340726
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs




More information about the universe-bugs mailing list