Breezy

Merge lp:~nmb/brz/1654049-new-project into lp:brz

  1. 1654049-new-project
  2. Merge into trunk
Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~nmb/brz/1654049-new-project
Merge into: lp:brz
Diff against target: 30 lines (+7/-3)
1 file modified
doc/en/mini-tutorial/index.txt (+7/-3)
To merge this branch: bzr merge lp:~nmb/brz/1654049-new-project
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+325957@code.launchpad.net

Commit message

Make mini tutorial example session more consistent

Description of the change

This just cleans up some of the example output in the mini-tutorial.

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

Thanks Neil, makes sense to keep treating this as a console session.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

A commit message must be set
http://10.242.247.184:8080/job/brz-dev/157/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/158/

Revision history for this message
Martin Packman (gz) wrote :

FAIL: breezy.tests.test_smart_transport.TestSmartTCPServer.test_graceful_shutdown_waits_for_clients_to_stop

22:49:25 O: Traceback (most recent call last):
22:49:25 O: File "/workspace/brz-dev/brz-dev/work/breezy/tests/test_smart_transport.py", line 1470, in test_graceful_shutdown_waits_for_clients_to_stop
22:49:25 O: """, flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
22:49:25 O: File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 435, in assertThat
22:49:25 O: raise mismatch_error
22:49:25 O: testtools.matchers._impl.MismatchError: Expected:
22:49:25 O: INFO Requested to stop gracefully
22:49:25 O: ... Stopping SmartServerSocketStreamMedium(client=('127.0.0.1', ...
22:49:25 O: INFO Waiting for 1 client(s) to finish
22:49:25 O: Got:
22:49:25 O: INFO Requested to stop gracefully
22:49:25 O: 192.112 Stopping SmartServerSocketStreamMedium(client=('127.0.0.1', 33832))

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 2017-05-21 13:35:49 +0000
3+++ doc/en/mini-tutorial/index.txt 2017-06-19 19:49:57 +0000
4@@ -70,7 +70,6 @@
5 Location:
6 shared repository: sample
7 $ brz init sample/trunk
8- $ cd sample/trunk
9 Created a repository tree (format: 2a)                                         
10 Using shared repository: /home/john/sample/
11
12@@ -84,11 +83,16 @@
13 and save it. Then we'll "add" the file, which tells brz we want it to
14 track changes::
15
16- brz add test1.txt
17+ $ cd sample/trunk
18+ # create the file test1.txt now
19+ $ brz add test1.txt
20+ adding test1.txt
21
22 and then commit, which saves a snapshot of all versioned files::
23
24- brz commit -m "Added first line of text"
25+ $ brz commit -m "Added first line of text"
26+ added test1.txt
27+ Committed revision 1.
28
29
30 Making changes to your files

Subscribers

People subscribed via source and target branches