/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

remove more duplicate merged hunks. Bad MERGE3, BAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
28
28
                  'BitKeeper',
29
29
                  '.git',
30
30
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
31
 
                  '.del-*',
32
 
                  '.DS_Store',]
 
31
                  '.del-*']
33
32
 
34
33
IGNORE_FILENAME = ".bzrignore"
35
34
 
36
 
import os
37
35
import locale
38
36
user_encoding = locale.getpreferredencoding() or 'ascii'
39
37
del locale
49
47
    from bzrlib.branch import Branch
50
48
    
51
49
    try:
52
 
        branch = Branch.open(os.path.dirname(__path__[0]))
 
50
        branch = Branch(__path__[0])
53
51
        rh = branch.revision_history()
54
52
        if rh:
55
53
            return len(rh), rh[-1]