« back to all changes in this revision
Viewing changes to bzrlib/patiencediff.py
- Committer: Canonical.com Patch Queue Manager
- Date: 2011-01-11 18:36:50 UTC
- mfrom: (5582.5.1 2.3-update-from-readonly-701212)
- Revision ID: pqm@pqm.ubuntu.com-20110111183650-e8cxdko7r2ruh3bq
(vila) Fix bug #701212,
don't set the tag dict of the master branch you are updating from. (John A
Meinel)
don't set the tag dict of the master branch you are updating from. (John A
Meinel)
- files added:
- bzrlib/deprecated_graph.py
- files removed:
- bzrlib/cethread.py
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- files modified:
- Makefile
added
removed
bzrlib/patiencediff.py
