Rev 2286: (mbp) add -d option to push, pull, merge (r=aaron) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2286
revision-id: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 09:51:20 +0000
message:
  (mbp) add -d option to push, pull, merge (r=aaron)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
    parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
    committer: mbp at sourcefrog.net
    branch nick: dashd
    timestamp: Tue 2007-02-13 20:21:08 +1100
    message:
      Add a -d option to push, pull, merge (ported from tags branch)