Bazaar

Merge lp:~parthm/bzr/369501_2.0_ver_on_bzr_cmd into lp:bzr/2.0

  1. 369501_2.0_ver_on_bzr_cmd
  2. Merge into 2.0
Proposed by Parth Malwankar
Status: Merged
Approved by: Martin Pool
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~parthm/bzr/369501_2.0_ver_on_bzr_cmd
Merge into: lp:bzr/2.0
Diff against target: 36 lines (+6/-2)
2 files modified
NEWS (+4/-0)
bzrlib/help_topics/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~parthm/bzr/369501_2.0_ver_on_bzr_cmd
Reviewer Review Type Date Requested Status
Martin Pool Approve
John A Meinel Approve
Review via email: mp+19499@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Parth Malwankar (parthm) wrote :

Trivial fix.
This fixes bug #369501 (against 2.0 series).

[369501_2.0_ver_on_bzr_cmd]% bzr
Bazaar 2.0.4 -- a free distributed version-control tool
....

is shown (note version number) instead of

[bzr.dev]% bzr
Bazaar -- a free distributed version-control tool
....

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Parth Malwankar wrote:
> Parth Malwankar has proposed merging lp:~parthm/bzr/369501_2.0_ver_on_bzr_cmd into lp:bzr/2.0.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #369501 Display version number when "bzr" is typed
> https://bugs.launchpad.net/bugs/369501
>
>
> Trivial fix.
> This fixes bug #369501 (against 2.0 series).
>
> [369501_2.0_ver_on_bzr_cmd]% bzr
> Bazaar 2.0.4 -- a free distributed version-control tool
> ....
>
> is shown (note version number) instead of
>
> [bzr.dev]% bzr
> Bazaar -- a free distributed version-control tool
> ....
>
>

 review: approve

Seems ok to me.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkt8FjwACgkQJdeBCYSNAAOX2gCfWMJ2TL4A1gvPtbBouYvTL/sw
PJQAnjcfougguupigxvzu5UiPpmVOR7u
=1GW2
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Martin Pool (mbp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-02-12 06:00:33 +0000
3+++ NEWS 2010-02-17 16:20:30 +0000
4@@ -22,6 +22,10 @@
5 ``UnboundLocalError``.
6 (Andrew Bennetts, #423563)
7
8+* Running ``bzr`` command without any arguments now shows bzr
9+ version number along with rest of the help text.
10+ (Parth Malwankar, #369501)
11+
12 Documentation
13 *************
14
15
16=== modified file 'bzrlib/help_topics/__init__.py'
17--- bzrlib/help_topics/__init__.py 2010-02-11 07:18:20 +0000
18+++ bzrlib/help_topics/__init__.py 2010-02-17 16:20:30 +0000
19@@ -262,7 +262,7 @@
20
21
22 _basic_help = \
23-"""Bazaar -- a free distributed version-control tool
24+"""Bazaar %s -- a free distributed version-control tool
25 http://bazaar-vcs.org/
26
27 Basic commands:
28@@ -286,7 +286,7 @@
29 bzr help init more help on e.g. init command
30 bzr help commands list all commands
31 bzr help topics list all help topics
32-"""
33+""" % bzrlib.__version__
34
35
36 _global_options = \

Subscribers

People subscribed via source and target branches