Rev 4056: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/RemoteRepository._format
Robert Collins
robertc at robertcollins.net
Thu Feb 26 11:01:29 GMT 2009
At http://people.ubuntu.com/~robertc/baz2.0/RemoteRepository._format
------------------------------------------------------------
revno: 4056
revision-id: robertc at robertcollins.net-20090226110120-x8x9dsy4fjemgaxq
parent: robertc at robertcollins.net-20090226060121-i33y7mbr72nqlvyv
parent: pqm at pqm.ubuntu.com-20090226073908-1fjp24b0llwqc0l7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: RemoteRepository._format
timestamp: Thu 2009-02-26 22:01:20 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4053.1.3
revision-id: pqm at pqm.ubuntu.com-20090226073908-1fjp24b0llwqc0l7
parent: pqm at pqm.ubuntu.com-20090226052717-5tbzaulyew9auo7t
parent: mbp at sourcefrog.net-20090226065820-uyo1nxpo0w7jkjsg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-26 07:39:08 +0000
message:
(mbp, trivial) typos in documentation
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4053.2.1
revision-id: mbp at sourcefrog.net-20090226065820-uyo1nxpo0w7jkjsg
parent: pqm at pqm.ubuntu.com-20090226031558-1ubr618vdn4r5f07
parent: frankaspell at googlemail.com-20090217114005-ojufrp6rqht664um
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2009-02-26 17:58:20 +1100
message:
Merge typo fixes
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4011.6.1
revision-id: frankaspell at googlemail.com-20090217114005-ojufrp6rqht664um
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Frank Aspell <frankaspell at googlemail.com>
branch nick: giveback2
timestamp: Tue 2009-02-17 12:40:05 +0100
message:
Fixed typos.
Fixed some typos in bzr doc's using "aspell -l en -c FILENAME".
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4053.1.2
revision-id: pqm at pqm.ubuntu.com-20090226052717-5tbzaulyew9auo7t
parent: pqm at pqm.ubuntu.com-20090226031558-1ubr618vdn4r5f07
parent: robertc at robertcollins.net-20090226023323-x36w98zx9jjmakpi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-26 05:27:17 +0000
message:
(robertc) Fix the root cause of bug 304841 rather than changing the
fetch order. (Robert Collins, John Arbash-Meinel)
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
------------------------------------------------------------
revno: 4052.1.2
revision-id: robertc at robertcollins.net-20090226023323-x36w98zx9jjmakpi
parent: robertc at robertcollins.net-20090226003951-c4tmpiirkq78q3us
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-304841
timestamp: Thu 2009-02-26 13:33:23 +1100
message:
Review feedback - fix flushing buffered records in knit's insert_record_stream.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 4052.1.1
revision-id: robertc at robertcollins.net-20090226003951-c4tmpiirkq78q3us
parent: pqm at pqm.ubuntu.com-20090225231224-r2fv2iqcgezje0zt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-304841
timestamp: Thu 2009-02-26 11:39:51 +1100
message:
Roll back the overly big fix to bug 304841, allowing _fetch order to move to RepositoryFormat.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
------------------------------------------------------------
revno: 4053.1.1
revision-id: pqm at pqm.ubuntu.com-20090226031558-1ubr618vdn4r5f07
parent: pqm at pqm.ubuntu.com-20090225235242-3h3yxyd8smf6b0g2
parent: robertc at robertcollins.net-20090226010618-tr1mdkrhu6i8c234
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-26 03:15:58 +0000
message:
(robertc) Fix race condition with branch hooks during cloning when
the new branch is stacked. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1
------------------------------------------------------------
revno: 4050.1.3
revision-id: robertc at robertcollins.net-20090226010618-tr1mdkrhu6i8c234
parent: robertc at robertcollins.net-20090226001302-ltc7k8ekbmcr2ofq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-02-26 12:06:18 +1100
message:
Add missed new parameter for branch reference cloning.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 4050.1.2
revision-id: robertc at robertcollins.net-20090226001302-ltc7k8ekbmcr2ofq
parent: robertc at robertcollins.net-20090225221725-0795sbskjouaxbm5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-02-26 11:13:02 +1100
message:
Bump stacked first push up by two calls (because the branch is stacked earlier).
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4050.1.1
revision-id: robertc at robertcollins.net-20090225221725-0795sbskjouaxbm5
parent: pqm at pqm.ubuntu.com-20090225171156-l63eiz2bz51ialsg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: clone.branch-takes-strategy
timestamp: Thu 2009-02-26 09:17:25 +1100
message:
Fix race condition with branch hooks during cloning when the new branch is stacked.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1
=== modified file 'NEWS'
--- a/NEWS 2009-02-26 04:25:00 +0000
+++ b/NEWS 2009-02-26 11:01:20 +0000
@@ -93,6 +93,13 @@
via RPC calls rather than VFS calls, reducing round trips for
pushing new branches substantially. (Robert Collins)
+ * ``Branch.clone`` now takes the ``repository_policy`` formerly used
+ inside ``BzrDir.clone_on_transport``, allowing stacking to be
+ configured before the branch tags and revision tip are set. This
+ fixes a race condition cloning stacked branches that would cause
+ plugins to have hooks called on non-stacked instances.
+ (Robert Collins, #334187)
+
* ``BzrDirFormat.__str__`` now uses the human readable description
rather than the sometimes-absent disk label. (Robert Collins)
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-02-13 21:21:25 +0000
+++ b/bzrlib/__init__.py 2009-02-25 22:17:25 +0000
@@ -53,8 +53,8 @@
version_info = (1, 13, 0, 'dev', 0)
-# API compatibility version: bzrlib is currently API compatible with 1.11.
-api_minimum_version = (1, 11, 0)
+# API compatibility version: bzrlib is currently API compatible with 1.13.
+api_minimum_version = (1, 13, 0)
def _format_version_tuple(version_info):
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2009-02-25 23:52:42 +0000
+++ b/bzrlib/branch.py 2009-02-26 03:15:58 +0000
@@ -878,7 +878,7 @@
raise errors.InvalidRevisionNumber(revno)
@needs_read_lock
- def clone(self, to_bzrdir, revision_id=None):
+ def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
"""Clone this branch into to_bzrdir preserving all semantic values.
Most API users will want 'create_clone_on_transport', which creates a
@@ -888,6 +888,8 @@
be truncated to end with revision_id.
"""
result = to_bzrdir.create_branch()
+ if repository_policy is not None:
+ repository_policy.configure_branch(result)
self.copy_content_into(result, revision_id=revision_id)
return result
@@ -1668,7 +1670,8 @@
def _make_reference_clone_function(format, a_branch):
"""Create a clone() routine for a branch dynamically."""
- def clone(to_bzrdir, revision_id=None):
+ def clone(to_bzrdir, revision_id=None,
+ repository_policy=None):
"""See Branch.clone()."""
return format.initialize(to_bzrdir, a_branch)
# cannot obey revision_id limits when cloning a reference ...
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-02-25 05:36:18 +0000
+++ b/bzrlib/bzrdir.py 2009-02-25 22:17:25 +0000
@@ -229,9 +229,8 @@
# make sure its content is available in the target repository
# clone it.
if local_branch is not None:
- result_branch = local_branch.clone(result, revision_id=revision_id)
- if repository_policy is not None:
- repository_policy.configure_branch(result_branch)
+ result_branch = local_branch.clone(result, revision_id=revision_id,
+ repository_policy=repository_policy)
try:
# Cheaper to check if the target is not local, than to try making
# the tree and fail.
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py 2009-02-25 21:13:22 +0000
+++ b/bzrlib/knit.py 2009-02-26 02:33:23 +0000
@@ -1517,6 +1517,7 @@
# key = basis_parent, value = index entry to add
buffered_index_entries = {}
for record in stream:
+ buffered = False
parents = record.parents
if record.storage_kind in delta_types:
# TODO: eventually the record itself should track
@@ -1568,7 +1569,6 @@
access_memo = self._access.add_raw_records(
[(record.key, len(bytes))], bytes)[0]
index_entry = (record.key, options, access_memo, parents)
- buffered = False
if 'fulltext' not in options:
# Not a fulltext, so we need to make sure the compression
# parent will also be present.
@@ -1609,15 +1609,16 @@
except errors.RevisionAlreadyPresent:
pass
# Add any records whose basis parent is now available.
- added_keys = [record.key]
- while added_keys:
- key = added_keys.pop(0)
- if key in buffered_index_entries:
- index_entries = buffered_index_entries[key]
- self._index.add_records(index_entries)
- added_keys.extend(
- [index_entry[0] for index_entry in index_entries])
- del buffered_index_entries[key]
+ if not buffered:
+ added_keys = [record.key]
+ while added_keys:
+ key = added_keys.pop(0)
+ if key in buffered_index_entries:
+ index_entries = buffered_index_entries[key]
+ self._index.add_records(index_entries)
+ added_keys.extend(
+ [index_entry[0] for index_entry in index_entries])
+ del buffered_index_entries[key]
if buffered_index_entries:
# There were index entries buffered at the end of the stream,
# So these need to be added (if the index supports holding such
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-02-25 00:31:09 +0000
+++ b/bzrlib/repository.py 2009-02-26 00:39:51 +0000
@@ -637,7 +637,6 @@
self.inventories.add_fallback_versioned_files(repository.inventories)
self.revisions.add_fallback_versioned_files(repository.revisions)
self.signatures.add_fallback_versioned_files(repository.signatures)
- self._fetch_order = 'topological'
def _check_fallback_repository(self, repository):
"""Check that this repository can fallback to repository safely.
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2009-02-25 16:27:41 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2009-02-26 00:13:02 +0000
@@ -219,7 +219,7 @@
# being too low. If rpc_count increases, more network roundtrips have
# become necessary for this use case. Please do not adjust this number
# upwards without agreement from bzr's network support maintainers.
- self.assertEqual(54, rpc_count)
+ self.assertEqual(56, rpc_count)
remote = Branch.open('public')
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
=== modified file 'bzrlib/tests/branch_implementations/test_create_clone.py'
--- a/bzrlib/tests/branch_implementations/test_create_clone.py 2009-02-25 03:22:12 +0000
+++ b/bzrlib/tests/branch_implementations/test_create_clone.py 2009-02-25 22:17:25 +0000
@@ -16,7 +16,9 @@
"""Tests for branch.create_clone behaviour."""
+from bzrlib.branch import Branch
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
+from bzrlib import remote
class TestCreateClone(TestCaseWithBranch):
@@ -54,3 +56,30 @@
stacked_on=trunk.base)
self.assertEqual(revid, result.last_revision())
self.assertEqual(trunk.base, result.get_stacked_on_url())
+
+ def assertBranchHookBranchIsStacked(self, pre_change_params):
+ # Just calling will either succeed or fail.
+ pre_change_params.branch.get_stacked_on_url()
+ self.hook_calls.append(pre_change_params)
+
+ def test_create_clone_on_transport_stacked_hooks_get_stacked_branch(self):
+ tree = self.make_branch_and_tree('source')
+ tree.commit('a commit')
+ trunk = tree.branch.create_clone_on_transport(
+ self.get_transport('trunk'))
+ revid = tree.commit('a second commit')
+ source = tree.branch
+ target_transport = self.get_transport('target')
+ self.hook_calls = []
+ Branch.hooks.install_named_hook("pre_change_branch_tip",
+ self.assertBranchHookBranchIsStacked, None)
+ result = tree.branch.create_clone_on_transport(target_transport,
+ stacked_on=trunk.base)
+ self.assertEqual(revid, result.last_revision())
+ self.assertEqual(trunk.base, result.get_stacked_on_url())
+ # Smart servers invoke hooks on both sides
+ if isinstance(result, remote.RemoteBranch):
+ expected_calls = 2
+ else:
+ expected_calls = 1
+ self.assertEqual(expected_calls, len(self.hook_calls))
=== modified file 'bzrlib/tests/per_repository/test_add_fallback_repository.py'
--- a/bzrlib/tests/per_repository/test_add_fallback_repository.py 2009-02-13 00:52:18 +0000
+++ b/bzrlib/tests/per_repository/test_add_fallback_repository.py 2009-02-26 00:39:51 +0000
@@ -65,13 +65,3 @@
self.addCleanup(other.unlock)
self.assertEqual({revision_id: (NULL_REVISION,)},
repo.get_graph(other).get_parent_map([revision_id]))
-
- def test_add_fallback_sets_fetch_order(self):
- repo = self.make_repository('repo')
- tree = self.make_branch_and_tree('branch')
- if not repo._format.supports_external_lookups:
- self.assertRaises(errors.UnstackableRepositoryFormat,
- repo.add_fallback_repository, tree.branch.repository)
- raise TestNotApplicable
- repo.add_fallback_repository(tree.branch.repository)
- self.assertEqual('topological', repo._fetch_order)
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2008-08-02 17:10:50 +0000
+++ b/doc/en/mini-tutorial/index.txt 2009-02-17 11:40:05 +0000
@@ -70,7 +70,7 @@
directories, then right-click in those directories and select
``New file`` to create your files.
-Now get Bazaar to initalize itself in your project directory::
+Now get Bazaar to initialize itself in your project directory::
$ bzr init
=== modified file 'doc/en/tutorials/using_bazaar_with_launchpad.txt'
--- a/doc/en/tutorials/using_bazaar_with_launchpad.txt 2008-01-04 19:22:40 +0000
+++ b/doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-02-17 11:40:05 +0000
@@ -114,7 +114,7 @@
together on related issues and roadmaps.
In other words, Launchpad has been designed to help your
-comunity grow and to reduce the workflow friction both
+community grow and to reduce the workflow friction both
*within* your community and *between* communities. Ultimately,
that means less time on mechanical tasks and more time for
interesting development.
@@ -441,7 +441,7 @@
In particular, Launchpad is a free code hosting service for your Bazaar
branches, branches can be browsed online, branches can be linked to bugs
and blueprints, and the status of bug-branch relationships can be
-automatically managed by mentioning the bug while commiting in Bazaar.
+automatically managed by mentioning the bug while committing in Bazaar.
Further integration is under development with the aim of streamlining
the process from *great idea* to *running code in the hands of end users*.
=== modified file 'doc/en/user-guide/adv_merging.txt'
--- a/doc/en/user-guide/adv_merging.txt 2007-12-14 07:35:49 +0000
+++ b/doc/en/user-guide/adv_merging.txt 2009-02-17 11:40:05 +0000
@@ -64,7 +64,7 @@
Merging uncommitted changes
---------------------------
-If you have several branches and you accidently start making changes in the
+If you have several branches and you accidentally start making changes in the
wrong one, here are the steps to take to correct this. Assuming you began
working in branch ``foo`` when you meant to work in branch ``bar``:
=== modified file 'doc/en/user-guide/organizing_branches.txt'
--- a/doc/en/user-guide/organizing_branches.txt 2008-12-24 03:14:16 +0000
+++ b/doc/en/user-guide/organizing_branches.txt 2009-02-17 11:40:05 +0000
@@ -23,7 +23,7 @@
Each new feature or fix is developed in its own branch.
These branches are referred to as *feature branches* or
-*task branches* - the terms are used interchangably.
+*task branches* - the terms are used interchangeably.
To create a task branch, use the ``branch`` command
against your mirror branch. For example::
=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- a/doc/en/user-guide/setting_up_email.txt 2007-12-17 01:45:32 +0000
+++ b/doc/en/user-guide/setting_up_email.txt 2009-02-17 11:40:05 +0000
@@ -7,7 +7,7 @@
----------------------------------------
Bazaar stores the specified email address in revisions when they're
-created so that people can tell who commited which revisions. The
+created so that people can tell who committed which revisions. The
email addresses are not verified, therefore they could be bogus, so
you have to trust the people involved in your project. Additionally,
the email address in a revision gives others a way to contact the
@@ -62,7 +62,7 @@
--------------------------------------------
To use the default ini file, create or edit the ``bazaar.conf`` file (in
-``~/.bazaar/`` on Linix and in ``%APPDATA%\bazaar\2.0\`` in Windows)
+``~/.bazaar/`` on Linux and in ``%APPDATA%\bazaar\2.0\`` in Windows)
and set an email address as shown below. Please note that the word DEFAULT
is case sensitive, and must be in upper-case.
::
=== modified file 'doc/en/user-guide/solo_intro.txt'
--- a/doc/en/user-guide/solo_intro.txt 2007-11-23 05:52:03 +0000
+++ b/doc/en/user-guide/solo_intro.txt 2009-02-17 11:40:05 +0000
@@ -5,7 +5,7 @@
----------------------------
Some tools are designed to make individuals productive (e.g. editors)
-while other tools (e.g. back-end services) are focussed on making teams
+while other tools (e.g. back-end services) are focused on making teams
or whole companies more productive. Version control tools have
traditionally been in the latter camp.
=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- a/doc/en/user-guide/specifying_revisions.txt 2007-12-14 07:35:49 +0000
+++ b/doc/en/user-guide/specifying_revisions.txt 2009-02-17 11:40:05 +0000
@@ -93,7 +93,7 @@
**before**
''rev'' specifies the leftmost parent of ''rev'', that is the revision
that appears before ''rev'' in the revision history, or the revision that
- was current when ''rev'' what comitted.
+ was current when ''rev'' what committed.
''rev'' can be any revision specifier and may be chained.
=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
--- a/doc/en/user-guide/undoing_mistakes.txt 2008-09-03 21:29:15 +0000
+++ b/doc/en/user-guide/undoing_mistakes.txt 2009-02-17 11:40:05 +0000
@@ -10,13 +10,13 @@
Dropping the revision history for a project
-------------------------------------------
-If you accidently put the wrong tree under version control, simply
+If you accidentally put the wrong tree under version control, simply
delete the ``.bzr`` directory.
Deregistering a file or directory
---------------------------------
-If you accidently register a file using ``add`` that you
+If you accidentally register a file using ``add`` that you
don't want version controlled, you can use the ``remove``
command to tell Bazaar to forget about it.
=== modified file 'doc/en/user-guide/using_aliases.txt'
--- a/doc/en/user-guide/using_aliases.txt 2007-11-30 04:28:32 +0000
+++ b/doc/en/user-guide/using_aliases.txt 2009-02-17 11:40:05 +0000
@@ -50,7 +50,7 @@
``commit --no-strict``.
* Aliases can override the standard behaviour of existing commands by giving
- an alias name that is the same as the orignal command. For example, default
+ an alias name that is the same as the original command. For example, default
commit is changed with ``commit=commit --strict``.
* Aliases cannot refer to other aliases. In other words making a
=== modified file 'doc/en/user-guide/using_gatekeepers.txt'
--- a/doc/en/user-guide/using_gatekeepers.txt 2007-11-23 15:45:20 +0000
+++ b/doc/en/user-guide/using_gatekeepers.txt 2009-02-17 11:40:05 +0000
@@ -22,7 +22,7 @@
acceptable, indeed common, to have multiple central branches with
different gatekeepers, e.g. one branch for the current production
release and another for the next release. In this case, a task branch
-holding a bug fix will most likely be advertized to both gatekeepers.
+holding a bug fix will most likely be advertised to both gatekeepers.
One of the great things about this workflow is that it is hugely
scalable. Large projects can be broken into teams and each
More information about the bazaar-commits
mailing list