Rev 1480: [merge] add --dry-run option (mpe) in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1480
revision-id: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 16:25:59 +1100
message:
  [merge] add --dry-run option (mpe)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
    parent: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: add-dry-run
    timestamp: Fri 2005-12-09 01:12:46 -0600
    message:
      Add tests for bzr add --dry-run
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
    parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: add-dry-run
    timestamp: Fri 2005-12-09 01:12:31 -0600
    message:
      Add support for bzr add --dry-run