Rev 2271: (John Arbash Meinel) allow 'bzr push' to resume an interrupted push, and push into an existing directory (#30576, #45504) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2271
revision-id: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
parent: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 22:55:51 +0000
message:
  (John Arbash Meinel) allow 'bzr push' to resume an interrupted push, and push into an existing directory (#30576, #45504)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
    parent: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix_push_alt
    timestamp: Wed 2007-02-07 13:33:40 -0600
    message:
      Update NEWS for fixing bugs #30576, #45504
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
    parent: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix_push_alt
    timestamp: Wed 2007-02-07 13:31:55 -0600
    message:
      Switch back to --use-existing-dir
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
    parent: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
    parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix_push_alt
    timestamp: Wed 2007-02-07 13:24:10 -0600
    message:
      [merge] bzr.dev 2270
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
    parent: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix_push_alt
    timestamp: Wed 2007-02-07 13:09:54 -0600
    message:
      Fix error message as suggested by Martin.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
    parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: fix_push_alt
    timestamp: Tue 2007-01-09 13:54:08 -0600
    message:
      Allow push to create Branch when necessary, and add --use-existing