/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2007-07-11 16:42:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070711164237-n1x38fz7fttybkqp
Push NULL_REVISION deeper

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1406
1406
                          other_branch=None):
1407
1407
        # stop_revision must be a descendant of last_revision
1408
1408
        stop_graph = self.repository.get_revision_graph(revision_id)
1409
 
        if not _mod_revision.is_null(last_rev) and last_rev not in stop_graph:
 
1409
        if (last_rev is not None and last_rev != _mod_revision.NULL_REVISION
 
1410
            and last_rev not in stop_graph):
1410
1411
            # our previous tip is not merged into stop_revision
1411
1412
            raise errors.DivergedBranches(self, other_branch)
1412
1413
        # make a new revision history from the graph