Rev 2019: (Robert Collins) Change the Branch bind method to just bind rather than binding and pushing (fixes #43744 and #39542) in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sun Sep 17 22:19:57 BST 2006


------------------------------------------------------------
revno: 2019
revision-id: pqm at pqm.ubuntu.com-20060917211956-6e30d07da410fd1a
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
parent: robertc at robertcollins.net-20060917210304-3a697132f5fb68ac
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-17 22:19:56 +0100
message:
  (Robert Collins) Change the Branch bind method to just bind rather than binding and pushing (fixes #43744 and #39542)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060917210304-3a697132f5fb68ac
    parent: robertc at robertcollins.net-20060911010359-0404571fa92c5cfe
    parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bind-does-not-push-or-pull
    timestamp: Mon 2006-09-18 07:03:04 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060911010359-0404571fa92c5cfe
    parent: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bind-does-not-push-or-pull
    timestamp: Mon 2006-09-11 11:03:59 +1000
    message:
      ``Branch.bind(other_branch)`` no longer takes a write lock on the
      other branch, and will not push or pull between the two branches.
      API users will need to perform a push or pull or update operation if they
      require branch synchronisation to take place. (Robert Collins)
      
      ``bzr bind`` no longer synchronises history with the master branch.
      Binding should be followed by an update or push to synchronise the 
      two branches. This fixes bug #39542 for heavyweight checkouts.
      (Robert Collins)



More information about the bazaar-commits mailing list