~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Committer: Robert Collins
Date: 2005-11-28 23:10:49 UTC
mfrom: (1185.66.9 bzr.revision-storage)
mto: (1185.67.11 bzr.revision-storage) (1534.1.15 integration)
mto: This revision was merged to the branch mainline in revision 1550.
Revision ID: robertc@robertcollins.net-20051128231049-4152aa936f0e223b

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

files removed:
bzrlib/clone.py

files renamed:
bzrlib/lockablefiles.py => bzrlib/lockable_files.py

bzrlib/revstorage.py => bzrlib/repository.py

files modified:
bzrlib/branch.py

bzrlib/builtins.py

bzrlib/check.py

bzrlib/fetch.py

bzrlib/log.py

bzrlib/merge.py

bzrlib/missing.py

bzrlib/revision.py

bzrlib/status.py

bzrlib/tests/blackbox/test_too_much.py

bzrlib/tests/test_ancestry.py

bzrlib/tests/test_annotate.py

bzrlib/tests/test_branch.py

bzrlib/tests/test_commit.py

bzrlib/tests/test_fetch.py

bzrlib/tests/test_inv.py

bzrlib/tests/test_merge_core.py

bzrlib/tests/test_parent.py

bzrlib/tests/test_revision.py

bzrlib/tests/test_revisionnamespaces.py

bzrlib/tests/test_status.py

Show diffs side-by-side

added added

removed removed

bzrlib/merge.py

492

return

493

if self.other_rev_id is None:

494

return

495

if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):

495

ancestry = self.this_branch.storage.get_ancestry(self.this_basis)

496

if self.other_rev_id in ancestry:

496

497

return

497

498

self.this_branch.working_tree().add_pending_merge(self.other_rev_id)

498

499

Older »