/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/repository.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
57
57
    entry_factory,
58
58
    )
59
59
from bzrlib import registry
60
 
from bzrlib.symbol_versioning import (
61
 
        deprecated_method,
62
 
        )
63
60
from bzrlib.trace import (
64
61
    log_exception_quietly, note, mutter, mutter_callsite, warning)
65
62
 
788
785
                        # references.
789
786
                        raise errors.UnsupportedOperation(tree.add_reference,
790
787
                            self.repository)
791
 
                    entry.reference_revision = \
792
 
                        tree.get_reference_revision(change[0])
 
788
                    reference_revision = tree.get_reference_revision(change[0])
 
789
                    entry.reference_revision = reference_revision
793
790
                    if (carry_over_possible and
794
791
                        parent_entry.reference_revision == reference_revision):
795
792
                        carried_over = True
1018
1015
                               parents, basis_inv=None, propagate_caches=False):
1019
1016
        """Add a new inventory expressed as a delta against another revision.
1020
1017
 
 
1018
        See the inventory developers documentation for the theory behind
 
1019
        inventory deltas.
 
1020
 
1021
1021
        :param basis_revision_id: The inventory id the delta was created
1022
1022
            against. (This does not have to be a direct parent.)
1023
1023
        :param delta: The inventory delta (see Inventory.apply_delta for