← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
1
 
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
63
63
    try:
64
64
        from bzrlib.workingtree import WorkingTree
65
65
        return WorkingTree.open_containing(__file__)[0]
66
 
    except (errors.NotBranchError, errors.UnknownFormatError):
 
66
    except (errors.NotBranchError, errors.UnknownFormatError,
 
67
            errors.NoWorkingTree):
67
68
        return None