Problem with merge (was: Re: [MERGE][0.15] Bugfix #82086: Searching location of CA bundle...)

Alexander Belchenko bialix at ukr.net
Tue Feb 27 20:22:53 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I sent merge request for my patch, but it fails.
The error message in selftest log don't belongs for my patch, so I simply
don't know how to fix this.

My branch here: http://bialix.aaronbentley.com/ca-bundle

Error message:

======================================================================
ERROR: test_32_lock_wait_succeed (bzrlib.tests.test_lockdir.TestLockDir)

vvvv[log from bzrlib.tests.test_lockdir.TestLockDir.test_32_lock_wait_succeed]
contention on
LockDir(file:///home/pqm/pqm-workdir/home/%2Btrunk/test0000.tmp/test_lockdir.TestLockDir.test_32_lock_wait_succeed/work/test_lock):
Directory not empty:
u'/home/pqm/pqm-workdir/home/+trunk/test0000.tmp/test_lockdir.TestLockDir.test_32_lock_wait_succeed/work/test_lock/pending.i56p2tuv12f7ub2g8ppe.tmp':
[Errno 39] Directory not empty
last_info: None, new info: {'nonce': u'dy2mnkcdozlh4514mkyo', 'start_time': u'1172601744',
'hostname': u'balleny', 'pid': u'20350', 'user': u'pqm at balleny'}

^^^^[log from bzrlib.tests.test_lockdir.TestLockDir.test_32_lock_wait_succeed]

- ----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pqm/pqm-workdir/home/+trunk/bzrlib/tests/test_lockdir.py", line 238, in
test_32_lock_wait_succeed
    lf2.wait_lock(timeout=0.4, poll=0.1)
  File "/home/pqm/pqm-workdir/home/+trunk/bzrlib/lockdir.py", line 416, in wait_lock
    raise LockContention(self)
LockContention: Could not acquire lock
LockDir(file:///home/pqm/pqm-workdir/home/%2Btrunk/test0000.tmp/test_lockdir.TestLockDir.test_32_lock_wait_succeed/work/test_lock)

- ----------------------------------------------------------------------


I run this test on my local machine and it successfully passed.
I don't understand this.

- --
Alexander

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF5JMdzYr338mxwCURAi6+AJwK8x9TT3vEqHZQgovgcuVORr6bBwCeNkPs
5b+OGgFTqk4UAnZjjIkKw4k=
=Rm2q
-----END PGP SIGNATURE-----




More information about the bazaar mailing list