~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

(vila) Merge 2.0 into 2.1 including fix for bug #583667 (Vincent
        Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
582
582
                    deadline_str = time.strftime('%H:%M:%S',
583
583
                                                 time.localtime(deadline))
584
584
                lock_url = self.transport.abspath(self.path)
585
 
                # See <https://bugs.edge.launchpad.net/bzr/+bug/250451>
 
585
                # See <https://bugs.launchpad.net/bzr/+bug/250451>
586
586
                # the URL here is sometimes not one that is useful to the
587
587
                # user, perhaps being wrapped in a lp-%d or chroot decorator,
588
588
                # especially if this error is issued from the server.