~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-04-16 12:21:47 UTC
mfrom: (5050.5.3 prepare-2.2)
mto: (5171.1.1 integration) (5340.2.1 2.2rc1-dev) (5050.17.1 2.2) (5344.1.1 integration) (5339.2.4 progress) (5246.2.31 merge-into-merger) (5362.1.1 merge-2.2-into-trunk) (5370.1.1 2.3b1-dev) (4360.10.22 smooth-upgrades) (5280.2.2 lazy-commands) (5377.2.1 merge-2.2-into-devel) (5418.1.1 merge-2.2-into-devel) (5430.1.1 merge-2.2-into-devel) (5432.3.1 prepare-2.3b1) (5439.1.1 merge-2.2-into-devel) (5447.1.1 trunk) (5473.1.1 trunk) (5540.4.1 checkout-tags-propagation-603395-2.3) (4597.12.2 646961-fix) (5523.1.1 trunk) (5530.1.1 trunk) (5535.1.1 merge-2.2-into-devel) (5551.1.1 trunk) (5552.1.1 583667-lp-no-edge-2.3) (5554.1.3 trunk) (5573.1.1 merge_2.2_to_dev) (5579.1.1 693880-ssl-readline) (5609.6.1 2.3.0-dev) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
mto: This revision was merged to the branch mainline in revision 5173.
Revision ID: pqm@pqm.ubuntu.com-20100416122147-xbcy3av3fd34hpho

(mbp) prepare 2.2b2

added added

removed removed

673

error_regexes = self._default_errors

674

else:

675

error_regexes = []

676

self.run_bzr(self._default_command + args,

677

working_dir=self._default_wd, error_regexes=error_regexes)

676

ret = self.run_bzr(self._default_command + args,

677

working_dir=self._default_wd,

678

error_regexes=error_regexes)

678

679

if pushed_revid is None:

679

680

pushed_revid = self._default_pushed_revid

680

681

tree_to = workingtree.WorkingTree.open('to')