← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2006-03-05 02:20:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: robertc@robertcollins.net-20060305022007-53e5907d083453e8
Local commits appear to be working properly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1223
1223
        if master is not None:
1224
1224
            old_tip = self.last_revision()
1225
1225
            self.pull(master, overwrite=True)
1226
 
            if old_tip == self.last_revision():
 
1226
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1227
1227
                return None
1228
1228
            return old_tip
1229
1229
        return None