/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sampler.py

  • Committer: Robert Collins
  • Date: 2006-09-11 01:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060911010359-0404571fa92c5cfe
``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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""Document what this test file is expecting to test here.
19
19