Bazaar

Merge lp:~nmb/bzr/735417-progress-help into lp:bzr

  1. 735417-progress-help
  2. Merge into bzr.dev
Proposed by Neil Martinsen-Burrell
Status: Merged
Merged at revision: 5911
Proposed branch: lp:~nmb/bzr/735417-progress-help
Merge into: lp:bzr
Diff against target: 14 lines (+3/-1)
1 file modified
bzrlib/help_topics/en/configuration.txt (+3/-1)
To merge this branch: bzr merge lp:~nmb/bzr/735417-progress-help
Reviewer Review Type Date Requested Status
Andrew Bennetts Approve
Review via email: mp+61824@code.launchpad.net

Description of the change

This branch fixes the documentation of BZR_PROGRESS_BAR to match the actual behavior.

I'm not sure how to propose this for merging forward into later revisions, but this change is branched from the head of lp:bzr/2.0. I will need Patch Pilot assistance to get this merged where it belongs.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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

On 5/20/2011 10:22 PM, Neil Martinsen-Burrell wrote:
> Neil Martinsen-Burrell has proposed merging lp:~nmb/bzr/735417-progress-help into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~nmb/bzr/735417-progress-help/+merge/61824
>
> This branch fixes the documentation of BZR_PROGRESS_BAR to match the actual behavior.
>
> I'm not sure how to propose this for merging forward into later revisions, but this change is branched from the head of lp:bzr/2.0. I will need Patch Pilot assistance to get this merged where it belongs.

You can propose it into lp:bzr/2.0 (there is a chooser you can use to
find it).

If we land it there, we will 'merge up' from 2.0=>2.1=>2.2=>2.3=>2.4.

However, I think we pretty much stopped supporting 2.0. Instead, we
should land it in 2.1 and merge up.

John
=:->

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

iEYEARECAAYFAk3XX24ACgkQJdeBCYSNAAOmTgCcDiK1iSWTWg6DbrvH/hv86tsE
PLAAoKZyBdactuLhZ/rnVIDWo2PFuO5z
=B4uH
-----END PGP SIGNATURE-----

Revision history for this message
Andrew Bennetts (spiv) wrote :

Looks good to me!

I agree with John that we should land it on 2.1 and then merge up from there.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/help_topics/en/configuration.txt'
2--- bzrlib/help_topics/en/configuration.txt 2011-05-18 01:02:52 +0000
3+++ bzrlib/help_topics/en/configuration.txt 2011-05-20 20:21:27 +0000
4@@ -19,7 +19,9 @@
5 BZR_PROGRESS_BAR
6 ~~~~~~~~~~~~~~~~
7
8-Override the progress display. Possible values are "none", "dots", "tty"
9+Override the progress display. Possible values are "none" or "text". If
10+the value is "none" then no progress bar is displayed. The value "text" draws
11+the ordinary command line progress bar.
12
13 BZR_SIGQUIT_PDB
14 ~~~~~~~~~~~~~~~