← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin Pool
  • Date: 2011-06-28 17:25:26 UTC
  • mfrom: (5999 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110628172526-10cok2s17dvw7x62
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
507
507
        if path_to_create is not None:
508
508
            tid = tt.trans_id_tree_path(path_to_create)
509
509
            transform.create_from_tree(
510
 
                tt, tt.trans_id_tree_path(path_to_create),
511
 
                self._revision_tree(tt._tree, revid), file_id)
 
510
                tt, tid, self._revision_tree(tt._tree, revid), file_id)
512
511
            tt.version_file(file_id, tid)
513
 
 
 
512
        else:
 
513
            tid = tt.trans_id_file_id(file_id)
514
514
        # Adjust the path for the retained file id
515
 
        tid = tt.trans_id_file_id(file_id)
516
515
        parent_tid = tt.get_tree_parent(tid)
517
516
        tt.adjust_path(osutils.basename(path), parent_tid, tid)
518
517
        tt.apply()