/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/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-26 20:55:33 UTC
  • mfrom: (1551.19.9 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071126205533-5vehpxjf6uk2n8fy
Revert of single files in deleted directories works

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1641
1641
        pp.next_phase()
1642
1642
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1643
1643
        try:
1644
 
            raw_conflicts = resolve_conflicts(tt, child_pb)
 
1644
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
1645
                lambda t, c: conflict_pass(t, c, target_tree))
1645
1646
        finally:
1646
1647
            child_pb.finished()
1647
1648
        conflicts = cook_conflicts(raw_conflicts, tt)
1817
1818
                try:
1818
1819
                    tt.final_name(trans_id)
1819
1820
                except NoFinalPath:
1820
 
                    file_id = tt.final_file_id(trans_id)
1821
 
                    entry = path_tree.inventory[file_id]
1822
 
                    parent_trans_id = tt.trans_id_file_id(entry.parent_id)
1823
 
                    tt.adjust_path(entry.name, parent_trans_id, trans_id)
 
1821
                    if path_tree is not None:
 
1822
                        file_id = tt.final_file_id(trans_id)
 
1823
                        entry = path_tree.inventory[file_id]
 
1824
                        parent_trans_id = tt.trans_id_file_id(entry.parent_id)
 
1825
                        tt.adjust_path(entry.name, parent_trans_id, trans_id)
1824
1826
        elif c_type == 'unversioned parent':
1825
1827
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1826
1828
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))