~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-07-21 11:22:53 UTC
mfrom: (5050.12.1 prepare-2.2)
mto: (5246.2.31 merge-into-merger) (5340.4.5 bzrw) (5362.1.1 merge-2.2-into-trunk) (5050.17.1 2.2) (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 5365.
Revision ID: pqm@pqm.ubuntu.com-20100721112253-4c8u0jdfqsk5o412

(mbp) merge 2.1 to 2.2 (Martin Pool)

added added

removed removed

375

This is designed more towards DWIM for humans than API clarity.

376

For the specific behaviour see the help for cmd_add().

377

378

:param file_list: List of zero or more paths. *NB: these are

379

interpreted relative to the process cwd, not relative to the

380

tree.* (Add and most other tree methods use tree-relative

381

paths.)

378

382

:param action: A reporter to be called with the inventory, parent_ie,

379

383

path and kind of the path being added. It may return a file_id if

380

384

a specific one should be used.