← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-01 19:41:16 UTC
  • mfrom: (2158 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
[merge] bzr.dev 2158

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
960
960
      it is silently replaced.
961
961
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
962
962
    """
963
 
    assert 2 > len(wt.inventory)
 
963
    if len(wt.inventory) > 1:  # more than just a root
 
964
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
964
965
    file_trans_id = {}
965
966
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
966
967
    pp = ProgressPhase("Build phase", 2, top_pb)