Bazaar

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

  1. trivial
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/trivial
Merge into: lp:bzr
Diff against target: 10 lines (+2/-0)
1 file modified
bzrlib/version.py (+2/-0)
To merge this branch: bzr merge lp:~mbp/bzr/trivial
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+15909@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

Mention in --version that bzr is a GNU project.

(Was previously proposed to 2.0, but that was silly because I started from 2.1. Anyhow it's not really a bug.)

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

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

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/trivial into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #463099 bzr help uncommit "the the" - one "the" wanted
> https://bugs.launchpad.net/bugs/463099
>
>
> Mention in --version that bzr is a GNU project.
>
> (Was previously proposed to 2.0, but that was silly because I started from 2.1. Anyhow it's not really a bug.)
>

 review: approve
 merge: approve

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

iEYEARECAAYFAksgRQkACgkQJdeBCYSNAAMEzACfQBGj+2UB4TmVffduZP8gGtx5
qJ8AoId0H91tTqi3TbbkvocuSZeuI980
=eRrL
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/version.py'
2--- bzrlib/version.py 2009-11-30 04:41:36 +0000
3+++ bzrlib/version.py 2009-12-10 00:24:16 +0000
4@@ -88,6 +88,8 @@
5 to_file.write("bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and\n")
6 to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
7 to_file.write("General Public License version 2 or later.\n")
8+ to_file.write("\nBazaar is part of the GNU Project to produce a free operating "
9+ "system.\n")
10 to_file.write('\n')
11
12