Merge lp:~mbp/bzr/doc into lp:bzr

Proposed by Martin Pool on 2011-07-01
Status: Merged
Approved by: Martin Pool on 2011-07-08
Approved revision: no longer in the source branch.
Merged at revision: 6016
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 59 lines (+26/-5)
2 files modified
doc/en/mini-tutorial/index.txt (+23/-2)
doc/en/whats-new/whats-new-in-2.4.txt (+3/-3)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
bzr-core 2011-07-01 Pending
Review via email: mp+66592@code.launchpad.net

Commit message

improved tutorial text; mention codename for release

Description of the change

Just mention the release codename in the whatsnew doc.

To post a comment you must log in.
John A Meinel (jameinel) wrote :

I don't really know what Oronsay is but
Merge: approve

=:->
On Jul 1, 2011 1:15 PM, "Martin Pool" <email address hidden> wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #398653 in Bazaar: "Releasing guide should include instructions on
updating trunk NEWS file"
> https://bugs.launchpad.net/bzr/+bug/398653
> Bug #473099 in Bazaar: "Incorrect markup in centralized workflow tutorial"
> https://bugs.launchpad.net/bzr/+bug/473099
> Bug #512385 in Bazaar: "Broken link to "quick start card" in online user
guide"
> https://bugs.launchpad.net/bzr/+bug/512385
> Bug #599187 in Bazaar: "selective commit not failing as documented"
> https://bugs.launchpad.net/bzr/+bug/599187
> Bug #664898 in Bazaar: "latex release notes fails with unicode error"
> https://bugs.launchpad.net/bzr/+bug/664898
> Bug #746237 in Bazaar: "Documentation markup bugs"
> https://bugs.launchpad.net/bzr/+bug/746237
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/doc/+merge/66592
>
> Just mention the release codename in the whatsnew doc.
> --
> https://code.launchpad.net/~mbp/bzr/doc/+merge/66592
> Your team Bazaar Codereview Subscribers is subscribed to branch lp:bzr.

Martin Pool (mbp) wrote :

It's the name of several Scottish Islands: it gives us an O-series name and it marks our Caledonian visitor.

lp:~mbp/bzr/doc updated on 2011-07-07
6007. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-01

(mbp) Fixes bug 785404 by using known executables for win32 (cmd.exe) and
 other platforms (sh) in test_exe_on_path. (Gordon Tyler)

6008. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-04

(vila) Fix typo in bug number (Vincent Ladeuil)

6009. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(jameinel) Make kind markers optional for bzr status. (Martin von Gagern)

6010. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(jameinel) Give a better warning when the bzr script doesn't match its
 bzrlib. (Martin Pool)

6011. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(benoit.pierre) Allow 'bzr version-info' to be run when the WT is at
 a dotted revno of the branch.

6012. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)

6013. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Handle path conflicts involving different root-ids (merged in
 from 2.3 + tweaks) (Vincent Ladeuil)

6014. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Release 2.4b5 (Vincent Ladeuil)

6015. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Open trunk again as 2.4dev6 (Vincent Ladeuil)

Martin Pool (mbp) wrote :

sent to pqm by email

lp:~mbp/bzr/doc updated on 2011-07-08
6016. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-08

(mbp) improved tutorial text; mention codename for release (Martin Pool)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/mini-tutorial/index.txt'
2--- doc/en/mini-tutorial/index.txt 2011-06-28 16:03:09 +0000
3+++ doc/en/mini-tutorial/index.txt 2011-07-01 22:03:32 +0000
4@@ -56,8 +56,12 @@
5
6 Let's suppose we want to store a new project under Bazaar. First, we'll
7 make a *repository directory* to hold all our work related to this
8-project. We can then have multiple branch directories under here, and
9-they'll all store the committed history in the repository.
10+project, where developers can create branches to test development of
11+specific features or, more generally, modifications to the working file
12+set.
13+
14+After creating the repository, change to that directory, and create the
15+project's main trunk branch.
16
17 ::
18
19@@ -67,9 +71,26 @@
20 cd trunk
21
22
23+Adding files
24+============
25+
26+Now that we have the trunk, we need to move to that directory and
27+create some example files for the first version of that project. Create
28+a file ``test1.txt`` using a text editor (like emacs, nano, or notepad),
29+and save it. Then we'll "add" the file, which tells bzr we want it to
30+track changes::
31+
32+ bzr add test1.txt
33+
34+and then commit, which saves a snapshot of all versioned files::
35+
36+ bzr commit -m "Added first line of text"
37+
38+
39 Making changes to your files
40 ============================
41
42+
43 Let's change a file and commit that change to your branch.
44
45 Edit ``test1.txt`` in your favourite editor, then check what have you done::
46
47=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
48--- doc/en/whats-new/whats-new-in-2.4.txt 2011-06-22 16:04:52 +0000
49+++ doc/en/whats-new/whats-new-in-2.4.txt 2011-07-01 22:03:32 +0000
50@@ -1,6 +1,6 @@
51-*************************
52-What's New in Bazaar 2.4?
53-*************************
54+***********************************
55+What's New in Bazaar 2.4 (Oronsay)?
56+***********************************
57
58 Bazaar 2.4 is still under development, and will be released in August 2011.
59 This document accumulates a high level summary of what's changed. See the