~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-12 21:38:35 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-20051112213835-282bdea6a76e7230
Wrote a simple test which actually makes a branch become bound, and made it work

Show diffs side-by-side

added added

removed removed

Lines of Context:
1123
1123
        # It is debatable whether you should be able to bind to
1124
1124
        # a branch which is itself bound.
1125
1125
        # Committing is obviously forbidden, but binding itself may not be.
1126
 
        if other.is_bound():
1127
 
            raise errors.CannotBind(msg='branch %s is bound' % (other.base))
 
1126
        #if other.is_bound():
 
1127
        #    raise errors.CannotBind(msg='branch %s is bound' % (other.base))
1128
1128
        try:
1129
1129
            self.working_tree().pull(other)
1130
1130
        except NoWorkingTree: