Rev 1964: (ddaa): Fix bug #40679, allow remote upgrade without working trees in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Aug 28 17:41:23 BST 2006


------------------------------------------------------------
revno: 1964
revision-id: pqm at pqm.ubuntu.com-20060828164122-9c1715bd268374ae
parent: pqm at pqm.ubuntu.com-20060828152314-9bd2bb284d84fab2
parent: john at arbash-meinel.com-20060828163215-b65427b0394f3a6e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-08-28 17:41:22 +0100
message:
  (ddaa): Fix bug #40679, allow remote upgrade without working trees
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060828163215-b65427b0394f3a6e
    parent: john at arbash-meinel.com-20060825220622-01c73727d1848769
    parent: pqm at pqm.ubuntu.com-20060828152314-9bd2bb284d84fab2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: upgrade-no-working-tree
    timestamp: Mon 2006-08-28 11:32:15 -0500
    message:
      [merge] bzr.dev 1963
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825220622-01c73727d1848769
    parent: john at arbash-meinel.com-20060825215948-f68b799cffec2973
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: upgrade-no-working-tree
    timestamp: Fri 2006-08-25 17:06:22 -0500
    message:
      NEWS: this should fix bug #40679
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825215948-f68b799cffec2973
    parent: john at arbash-meinel.com-20060825215626-d0143c0966bd37e2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: upgrade-no-working-tree
    timestamp: Fri 2006-08-25 16:59:48 -0500
    message:
      Update docstring
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060825215626-d0143c0966bd37e2
    parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: upgrade-no-working-tree
    timestamp: Fri 2006-08-25 16:56:26 -0500
    message:
      David Allouche: bzr upgrade should work if there is no working tree



More information about the bazaar-commits mailing list