~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
        revno = len(rh)
27
27
 
28
28
    files_to_remove = []
29
 
    new_rev_history = AtomicFile(branch.controlfilename('revision-history'))
 
29
    new_rev_history = AtomicFile(branch.control_files.controlfilename('revision-history'))
30
30
    for r in range(revno-1, len(rh)):
31
31
        rev_id = rh.pop()
32
32
        if verbose: