Rev 4939: (__monty__) Write the version of bzr to the log file, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4939 [merge]
revision-id: pqm at pqm.ubuntu.com-20100107071820-8rn58yjf0444bh5h
parent: pqm at pqm.ubuntu.com-20100107061115-hsurc86kqu9z5vq0
parent: andrew.bennetts at canonical.com-20100107063414-lev7gteuo05wyqd9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-01-07 07:18:20 +0000
message:
  (__monty__) Write the version of bzr to the log file,
  	and fix some doc typos. (#257170)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
=== modified file 'NEWS'
--- a/NEWS	2010-01-07 05:22:46 +0000
+++ b/NEWS	2010-01-07 06:34:14 +0000
@@ -78,6 +78,9 @@
   VCS for which roundtripping is not supported, and will suggest them to 
   use dpush. (Jelmer Vernooij)
 
+* The version of bzr being run is now written to the log file.
+  (__monty__, #257170)
+
 * Transport network activity indicator is shown more of the time when
   Bazaar is doing network IO.
   (Martin Pool)

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2009-12-18 17:59:58 +0000
+++ b/bzrlib/commands.py	2010-01-07 06:34:14 +0000
@@ -927,6 +927,7 @@
     --concurrency
         Specify the number of processes that can be run concurrently (selftest).
     """
+    trace.mutter("bazaar version: " + bzrlib.__version__)
     argv = list(argv)
     trace.mutter("bzr arguments: %r", argv)
 

=== modified file 'doc/developers/HACKING.txt'
--- a/doc/developers/HACKING.txt	2009-12-02 20:34:07 +0000
+++ b/doc/developers/HACKING.txt	2009-12-29 14:29:08 +0000
@@ -62,7 +62,7 @@
 to involving the community before you spend much time on a change.
 These include:
 
-* you get to build on the wisdom on others, saving time
+* you get to build on the wisdom of others, saving time
 
 * if others can direct you to similar code, it minimises the work to be done
 
@@ -680,7 +680,7 @@
 ``only_raises`` decorator (from ``bzrlib.decorators``) for methods that
 are typically called in ``finally`` blocks, such as ``unlock`` methods.
 For example, ``@only_raises(LockNotHeld, LockBroken)``.  All errors that
-are unlikely to be a knock-on failure from an previous failure should be
+are unlikely to be a knock-on failure from a previous failure should be
 allowed.