← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-31 15:19:21 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051231151921-351e2877d360e537
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
359
359
        if not self.bound_branch:
360
360
            return
361
361
        # We always want the local branch to look like the remote one
 
362
        # TODO: jam 20051231 We might want overwrite=True here, but
 
363
        #       the local branch should be a child of master anyway
362
364
        self.bound_branch.pull(self.master_branch)
363
365
 
 
366
        # TODO: jam 20051231 At this point we probably 
 
367
        #       want to merge any changes into master branch's
 
368
        #       working tree.
 
369
        
 
370
 
364
371
    def _record_inventory(self):
365
372
        """Store the inventory for the new revision."""
366
373
        inv_text = serializer_v5.write_inventory_to_string(self.new_inv)