~bzr-pqm/bzr/1.17

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
 
34
34
IGNORE_FILENAME = ".bzrignore"
35
35
 
 
36
import os
36
37
import locale
37
38
user_encoding = locale.getpreferredencoding() or 'ascii'
38
39
del locale
48
49
    from bzrlib.branch import Branch
49
50
    
50
51
    try:
51
 
        import os
52
52
        branch = Branch.open(os.path.dirname(__path__[0]))
53
53
        rh = branch.revision_history()
54
54
        if rh: