Rev 1927: (jam) add '--file-ids-from' to 'bzr add' (bug #55781) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1927
revision-id: pqm at pqm.ubuntu.com-20060815155756-77559a6254704822
parent: pqm at pqm.ubuntu.com-20060815141658-4a1356532d7aa155
parent: john at arbash-meinel.com-20060815155031-f1480d692d2cf9d2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-15 16:57:56 +0100
message:
  (jam) add '--file-ids-from' to 'bzr add' (bug #55781)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060815155031-f1480d692d2cf9d2
    parent: john at arbash-meinel.com-20060814235630-94238477f9899991
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add-action-55781
    timestamp: Tue 2006-08-15 10:50:31 -0500
    message:
      There is no strict ordering file addition, other than directories are added before child files
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060814235630-94238477f9899991
    parent: john at arbash-meinel.com-20060814235253-f2f7336b88df4e62
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add-action-55781
    timestamp: Mon 2006-08-14 18:56:30 -0500
    message:
      NEWS entry for fixing bug #55781
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060814235253-f2f7336b88df4e62
    parent: john at arbash-meinel.com-20060809195302-38b349ff2e1473b4
    parent: pqm at pqm.ubuntu.com-20060814213105-9c0d22f04d44049e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add-action-55781
    timestamp: Mon 2006-08-14 18:52:53 -0500
    message:
      [merge] bzr.dev 1920
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060809195302-38b349ff2e1473b4
    parent: john at arbash-meinel.com-20060809172541-e88fda324fa9bac7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add-action-55781
    timestamp: Wed 2006-08-09 14:53:02 -0500
    message:
      Adding the AddFromBaseAction, which tries to reuse file ids from another tree
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060809172541-e88fda324fa9bac7
    parent: pqm at pqm.ubuntu.com-20060809170522-28c918e7d93365fe
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add-action-55781
    timestamp: Wed 2006-08-09 12:25:41 -0500
    message:
      Updated smart_add so that the AddAction can return a custom id.