~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-08-30 05:55:13 UTC
  • Revision ID: mbp@sourcefrog.net-20050830055513-162d1d2d44091e0f
- add test that branching sets the parent of the new branch
- cleanup code that does this

Show diffs side-by-side

added added

removed removed

Lines of Context:
1473
1473
    br_to.update_revisions(branch_from, stop_revision=revno)
1474
1474
    merge((to_location, -1), (to_location, 0), this_dir=to_location,
1475
1475
          check_clean=False, ignore_zero=True)
 
1476
    
1476
1477
    from_location = pull_loc(branch_from)
1477
 
    br_to.controlfile("x-pull", "wb").write(from_location + "\n")
 
1478
    br_to.set_parent(pull_loc(branch_from))
1478
1479