« back to all changes in this revision
Viewing changes to bzrlib/merge_directive.py
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-10-29 07:19:49 UTC
- mfrom: (4634.90.3 log-objectnotlocked-bug-445171)
- mto: (4776.1.1 jam-integration) (4634.93.1 2.0.2) (4782.1.1 jam-integration) (4797.17.1 alias-loc-docs-337834-2.1) (4854.1.1 merge-2.0-into-devel) (4896.1.1 2.1.0b4-dev) (4899.1.1 jam-integration) (4927.1.1 merge-2.0-into-devel) (4931.1.2 jam-integration) (4932.1.1 2.1.0rc1-pyrex-propagation) (4946.1.1 2.1.0rc1-unregister-mem-trans) (4949.1.1 integration) (4953.1.1 jam-integration) (4957.1.1 jam-integration) (4964.1.1 integration) (4967.1.1 jam-integration) (4981.1.2 2.1.0rc1-dev) (4999.3.1 apport) (5051.4.1 376388-dot-bazaar-ownership) (5045.1.1 369501-version) (5346.4.1 cleanup) (5174.1.1 jam-integration) (5074.5.1 fix-523746-dev) (4778.1.1 2.1.0b2) (4668.1.4 2.1.0b2)
- mto: This revision was merged to the branch mainline in revision 4777.
- Revision ID: pqm@pqm.ubuntu.com-20091029071949-pgkco78w8pihlrnx
(andrew) Fix ObjectNotLocked errors during 'bzr log'. (#445171)
added
removed
bzrlib/merge_directive.py
