← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1454
1454
            # we fetch here regardless of whether we need to so that we pickup
1455
1455
            # filled in ghosts.
1456
1456
            self.fetch(other, stop_revision)
1457
 
            my_ancestry = self.repository.get_ancestry(last_rev)
 
1457
            my_ancestry = self.repository.get_ancestry(last_rev,
 
1458
                                                       topo_sorted=False)
1458
1459
            if stop_revision in my_ancestry:
1459
1460
                # last_revision is a descendant of stop_revision
1460
1461
                return
1813
1814
        if master is not None:
1814
1815
            old_tip = self.last_revision()
1815
1816
            self.pull(master, overwrite=True)
1816
 
            if old_tip in self.repository.get_ancestry(self.last_revision()):
 
1817
            if old_tip in self.repository.get_ancestry(self.last_revision(),
 
1818
                                                       topo_sorted=False):
1817
1819
                return None
1818
1820
            return old_tip
1819
1821
        return None