Rev 4776: (mbp) remove 'the the' typos in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Oct 29 08:04:30 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4776 [merge]
revision-id: pqm at pqm.ubuntu.com-20091029080429-lyew1dt9mf17vuje
parent: pqm at pqm.ubuntu.com-20091028010822-2qrdd38w5rcfki8s
parent: mbp at sourcefrog.net-20091029061123-vyjm0si2r97rgsp2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-10-29 08:04:29 +0000
message:
(mbp) remove 'the the' typos
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
=== modified file 'NEWS'
--- a/NEWS 2009-10-28 00:12:03 +0000
+++ b/NEWS 2009-10-29 05:57:55 +0000
@@ -641,7 +641,7 @@
* ``bzr shelve`` and ``bzr unshelve`` now work on windows.
(Robert Collins, #305006)
-* Commit of specific files no longer prevents using the the iter_changes
+* Commit of specific files no longer prevents using the iter_changes
codepath. On 2a repositories, commit of specific files should now be as
fast, or slightly faster, than a full commit. (Robert Collins)
@@ -1410,7 +1410,7 @@
************
* A new repository format ``2a`` has been added. This is a beta release
- of the the brisbane-core (aka group-compress) project. This format now
+ of the brisbane-core (aka group-compress) project. This format now
suitable for wider testing by advanced users willing to deal with some
bugs. We would appreciate test reports, either positive or negative.
Format 2a is substantially smaller and faster for many operations on
@@ -2139,7 +2139,7 @@
* Added ``bzrlib.inventory_delta`` module. This will be used for
serializing and deserializing inventory deltas for more efficient
- streaming on the the network. (Robert Collins, Andrew Bennetts)
+ streaming on the network. (Robert Collins, Andrew Bennetts)
* ``Branch._get_config`` has been added, which splits out access to the
specific config file from the branch. This is used to let RemoteBranch
@@ -4863,7 +4863,7 @@
exception. (Andrew Bennetts)
* New ``--debugflag``/``-E`` option to ``bzr selftest`` for setting
- options for debugging tests, these are complementary to the the -D
+ options for debugging tests, these are complementary to the -D
options. The ``-Dselftest_debug`` global option has been replaced by the
``-E=allow_debug`` option for selftest. (Andrew Bennetts)
=== modified file 'bzrlib/_patiencediff_c.c'
--- a/bzrlib/_patiencediff_c.c 2009-03-23 14:59:43 +0000
+++ b/bzrlib/_patiencediff_c.c 2009-10-29 06:11:23 +0000
@@ -298,7 +298,7 @@
apos = SENTINEL;
/* loop through all lines in the linked list */
for (i = h[equiv].a_pos; i != SENTINEL; i = lines_a[i].next) {
- /* the index is lower than alo, the the next line */
+ /* the index is lower than alo, continue to the next line */
if (i < alo) {
h[equiv].a_pos = i;
continue;
@@ -319,7 +319,7 @@
/* check for duplicates of this line in lines_b[blo:bhi] */
/* loop through all lines in the linked list */
for (i = h[equiv].b_pos; i != SENTINEL; i = lines_b[i].next) {
- /* the index is lower than blo, the the next line */
+ /* the index is lower than blo, continue to the next line */
if (i < blo) {
h[equiv].b_pos = i;
continue;
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-10-12 22:09:19 +0000
+++ b/bzrlib/builtins.py 2009-10-29 05:54:49 +0000
@@ -4511,7 +4511,7 @@
before they will be applied to the local branch.
Bound branches use the nickname of its master branch unless it is set
- locally, in which case binding will update the the local nickname to be
+ locally, in which case binding will update the local nickname to be
that of the master.
"""
@@ -5362,7 +5362,7 @@
/path/to/newbranch.
Bound branches use the nickname of its master branch unless it is set
- locally, in which case switching will update the the local nickname to be
+ locally, in which case switching will update the local nickname to be
that of the master.
"""
=== modified file 'bzrlib/delta.py'
--- a/bzrlib/delta.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/delta.py 2009-10-29 05:54:49 +0000
@@ -47,7 +47,7 @@
Files that are both modified and renamed are listed only in
renamed, with the text_modified flag true. The text_modified
- applies either to the the content of the file or the target of the
+ applies either to the content of the file or the target of the
symbolic link, depending of the kind of file.
Files are only considered renamed if their name has changed or
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py 2009-10-19 15:45:10 +0000
+++ b/bzrlib/index.py 2009-10-29 05:54:49 +0000
@@ -1170,7 +1170,7 @@
self._parsed_key_map.insert(index + 1, new_key)
def _read_and_parse(self, readv_ranges):
- """Read the the ranges and parse the resulting data.
+ """Read the ranges and parse the resulting data.
:param readv_ranges: A prepared readv range list.
"""
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py 2009-10-26 06:44:40 +0000
+++ b/bzrlib/knit.py 2009-10-29 05:54:49 +0000
@@ -2367,7 +2367,7 @@
FLAGS is a comma separated list of flags about the record. Values include
no-eol, line-delta, fulltext.
BYTE_OFFSET is the ascii representation of the byte offset in the data file
- that the the compressed data starts at.
+ that the compressed data starts at.
LENGTH is the ascii representation of the length of the data file.
PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
REVISION_ID.
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2009-10-28 00:12:03 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2009-10-29 05:54:49 +0000
@@ -1117,7 +1117,7 @@
iterator is a tuple with:
index, readv_vector, node_vector. readv_vector is a list ready to
hand to the transport readv method, and node_vector is a list of
- (key, eol_flag, references) for the the node retrieved by the
+ (key, eol_flag, references) for the node retrieved by the
matching readv_vector.
"""
# group by pack so we do one readv per pack
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2009-09-17 11:54:41 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2009-10-29 05:54:49 +0000
@@ -77,11 +77,11 @@
self.assertSubset([getattr(repo._format, attribute)], allowed_values)
def test_attribute__fetch_order(self):
- """Test the the _fetch_order attribute."""
+ """Test the _fetch_order attribute."""
self.assertFormatAttribute('_fetch_order', ('topological', 'unordered'))
def test_attribute__fetch_uses_deltas(self):
- """Test the the _fetch_uses_deltas attribute."""
+ """Test the _fetch_uses_deltas attribute."""
self.assertFormatAttribute('_fetch_uses_deltas', (True, False))
def test_attribute_fast_deltas(self):
@@ -89,7 +89,7 @@
self.assertFormatAttribute('fast_deltas', (True, False))
def test_attribute__fetch_reconcile(self):
- """Test the the _fetch_reconcile attribute."""
+ """Test the _fetch_reconcile attribute."""
self.assertFormatAttribute('_fetch_reconcile', (True, False))
def test_attribute_format_pack_compresses(self):
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py 2009-08-17 03:58:18 +0000
+++ b/bzrlib/tests/test_commit.py 2009-10-29 05:54:49 +0000
@@ -484,7 +484,7 @@
other_bzrdir = master_branch.bzrdir.sprout('other')
other_tree = other_bzrdir.open_workingtree()
- # do a commit to the the other branch changing the content file so
+ # do a commit to the other branch changing the content file so
# that our commit after merging will have a merged revision in the
# content file history.
self.build_tree_contents([('other/content_file', 'change in other\n')])
More information about the bazaar-commits
mailing list