Bazaar

Merge lp:~amanica/bzr/nested-trees-typos into lp:bzr

  1. nested-trees-typos
  2. Merge into bzr.dev
Proposed by Marius Kruger
Status: Merged
Merged at revision: 6518
Proposed branch: lp:~amanica/bzr/nested-trees-typos
Merge into: lp:bzr
Prerequisite: lp:~jelmer/bzr/nested-trees-spec
Diff against target: 41 lines (+5/-5)
1 file modified
doc/developers/nested-trees.txt (+5/-5)
To merge this branch: bzr merge lp:~amanica/bzr/nested-trees-typos
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+100093@code.launchpad.net

This proposal supersedes a proposal from 2012-03-30.

Description of the change

some typos found while reviewing https://code.launchpad.net/~jelmer/bzr/nested-trees-spec/+merge/98067

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

Thanks Marius!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/developers/nested-trees.txt'
2--- doc/developers/nested-trees.txt 2012-03-30 09:43:21 +0000
3+++ doc/developers/nested-trees.txt 2012-03-30 09:43:21 +0000
4@@ -377,7 +377,7 @@
5 $ bzr merge -d project http://library2
6 $ bzr commit project -m "Updated library2"
7 $ bzr push -d project
8- $ bzr revert project
9+ $ bzr revert -r-2 project
10 $ bzr commit project -m "Reverted inappropriate changes."
11 $ bzr push -d project
12
13@@ -799,7 +799,7 @@
14 online.
15
16 At the moment, nested trees need to be incorporated as a whole.
17-Filtered views can to used to restrict the set of files and directories
18+Filtered views can be used to restrict the set of files and directories
19 logically seen. Currently though, filtered views are a lens onto a tree:
20 they do not delete other files and the exposed files/directories must
21 have the same paths as they do in the original branch. In the future,
22@@ -936,7 +936,7 @@
23 $ bzr ci -m "Change file"
24 $ bzr uncommit
25
26-will first commit to the subtree, then to the top tree. The uncommit will
27+will first uncommit to the subtree, then to the top tree. The uncommit will
28 restore both trees to their previous state.
29
30
31@@ -944,8 +944,8 @@
32 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33
34 We will not provide special support for this initially. We might later support
35-flagging some sub-trees as mirror-only something similar, but this seems like
36-it could be a general feture not specific to nesting. (and it may only require
37+flagging some sub-trees as mirror-only or something similar, but this seems like
38+it could be a general feature not specific to nesting. (and it may only require
39 a working tree format bump to add).
40
41 Comparison with other systems