Breezy

Merge lp:~jelmer/brz/doc-typos into lp:brz

  1. doc-typos
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/doc-typos
Merge into: lp:brz
Diff against target: 69 lines (+6/-6)
4 files modified
breezy/_known_graph_pyx.pyx (+2/-2)
breezy/_patiencediff_c.c (+1/-1)
breezy/builtins.py (+2/-2)
breezy/bzr/_dirstate_helpers_pyx.pyx (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/doc-typos
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+362285@code.launchpad.net

Commit message

Fix two typos in command help.

Description of the change

Fix two typos in command help.

Found by lintian.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/_known_graph_pyx.pyx'
2--- breezy/_known_graph_pyx.pyx 2018-07-01 22:21:53 +0000
3+++ breezy/_known_graph_pyx.pyx 2019-01-27 18:59:14 +0000
4@@ -649,7 +649,7 @@
5 def get_parent_keys(self, key):
6 """Get the parents for a key
7
8- Returns a list containg the parents keys. If the key is a ghost,
9+ Returns a list containing the parents keys. If the key is a ghost,
10 None is returned. A KeyError will be raised if the key is not in
11 the graph.
12
13@@ -661,7 +661,7 @@
14 def get_child_keys(self, key):
15 """Get the children for a key
16
17- Returns a list containg the children keys. A KeyError will be raised
18+ Returns a list containing the children keys. A KeyError will be raised
19 if the key is not in the graph.
20
21 :param keys: Key to check (eg revision_id)
22
23=== modified file 'breezy/_patiencediff_c.c'
24--- breezy/_patiencediff_c.c 2018-07-12 18:25:59 +0000
25+++ breezy/_patiencediff_c.c 2019-01-27 18:59:14 +0000
26@@ -963,7 +963,7 @@
27 static char PatienceSequenceMatcher_get_grouped_opcodes_doc[] =
28 "Isolate change clusters by eliminating ranges with no changes.\n"
29 "\n"
30- "Return a list of groups with upto n lines of context.\n"
31+ "Return a list of groups with up to n lines of context.\n"
32 "Each group is in the same format as returned by get_opcodes().\n"
33 "\n"
34 ">>> from pprint import pprint\n"
35
36=== modified file 'breezy/builtins.py'
37--- breezy/builtins.py 2019-01-04 21:21:12 +0000
38+++ breezy/builtins.py 2019-01-27 18:59:14 +0000
39@@ -3479,7 +3479,7 @@
40
41 :Things to note:
42
43- If you accidentially commit the wrong changes or make a spelling
44+ If you accidentally commit the wrong changes or make a spelling
45 mistake in the commit message say, you can use the uncommit command
46 to undo it. See ``brz help uncommit`` for details.
47
48@@ -4798,7 +4798,7 @@
49 update command.
50
51 Uncommitted changes to files that are reverted will be discarded.
52- Howver, by default, any files that have been manually changed will be
53+ However, by default, any files that have been manually changed will be
54 backed up first. (Files changed only by merge are not backed up.) Backup
55 files have '.~#~' appended to their name, where # is a number.
56
57
58=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
59--- breezy/bzr/_dirstate_helpers_pyx.pyx 2018-09-11 02:50:43 +0000
60+++ breezy/bzr/_dirstate_helpers_pyx.pyx 2019-01-27 18:59:14 +0000
61@@ -262,7 +262,7 @@
62 children appear. But all grandchildren come after all children.
63
64 In other words, all entries in a directory are sorted together, and
65- directorys are sorted in cmp_by_dirs order.
66+ directories are sorted in cmp_by_dirs order.
67
68 :param path1: first path
69 :param path2: the second path

Subscribers

People subscribed via source and target branches