Rev 1611: Merge Erik Bagfors --trees option for init-repository. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1611
revision-id: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
parent: pqm at pqm.ubuntu.com-20060404011055-cc6bc217328f4055
parent: robertc at robertcollins.net-20060404002828-7ae872815166a0e2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-04-04 02:48:51 +0100
message:
  Merge Erik Bagfors --trees option for init-repository.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060404002828-7ae872815166a0e2
    parent: robertc at robertcollins.net-20060403234436-466c7aadf509e8ca
    parent: erik at bagfors.nu-20060329094049-ddc3e517db0d25a1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-04-04 10:28:28 +1000
    message:
      Merge Erik BÃ¥gfors --trees option for init-repository.
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060329094049-ddc3e517db0d25a1
    parent: erik at bagfors.nu-20060327190247-5f779fafbe699542
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.init-repo-tree
    timestamp: Wed 2006-03-29 11:40:49 +0200
    message:
      rename --tree to --trees
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060327190247-5f779fafbe699542
    parent: erik at bagfors.nu-20060327150517-528234a7fad43092
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.init-repo-tree
    timestamp: Mon 2006-03-27 21:02:47 +0200
    message:
      better test for --tree option
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060327150517-528234a7fad43092
    parent: erik at bagfors.nu-20060324103333-a78aa3c9464f40c6
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.init-repo-tree
    timestamp: Mon 2006-03-27 17:05:17 +0200
    message:
      tests for --tree
    ------------------------------------------------------------
    merged: erik at bagfors.nu-20060324103333-a78aa3c9464f40c6
    parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
    committer: Erik BÃ¥gfors <erik at bagfors.nu>
    branch nick: bzr.init-repo-tree
    timestamp: Fri 2006-03-24 11:33:33 +0100
    message:
      support for --tree in bzr init-repo