Merge lp:brz/3.3 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.3

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7f27e1ae7a30>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/setuptools-gettext/
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7f27e1ae7d30>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/setuptools-gettext/
Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.2bzxo10x
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Collecting python-subunit
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 182.8 kB/s eta 0:00:00
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 172.3 kB/s eta 0:00:00
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 77.6 kB/s eta 0:00:00
Collect...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7fe3b3a8fa30>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /simple/setuptools-gettext/
Collecting setuptools-gettext
  WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7fe3b3915270>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /packages/a2/df/bcb42785c8dad53d26811d8dae93df9971e93ceee3655657e217faa86481/setuptools_gettext-0.1.1-py3-none-any.whl
  WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.HTTPSConnection object at 0x7fe3b39154e0>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution')': /packages/a2/df/bcb42785c8dad53d26811d8dae93df9971e93ceee3655657e217faa86481/setuptools_gettext-0.1.1-py3-none-any.whl
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.wm2x03sz
  Installing build dependencies: started
  Installing build dependencies: still running...
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Collecting docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 176.1 kB/s eta 0:00:00
Requirement already satisfied: setuptools in ./lib/python3.10/site-packag...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.whjxm0q1
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit
  Using cached python_subunit-1.4.2-py3-none-any.whl (106 kB)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting docutils
  Using cached docutils-0.19-py3-none-any.whl (570 kB)
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.1.dev0) (2.12.0)
Collecting fastimport
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Requirement already satisfied: keyring in /usr/local/lib/python3.10/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (23.11.0)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /us...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.h89nyu8c
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.1.dev0) (2.12.0)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting docutils
  Using cached docutils-0.19-py3-none-any.whl (570 kB)
Collecting fastimport
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Collecting python-subunit
  Using cached python_subunit-1.4.2-py3-none-any.whl (106 kB)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Requirement already satisfied: keyring in /usr/local/lib/python3.10/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (23.11.0)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /us...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Using cached setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.wm1e9d08
  Installing build dependencies: started
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Collecting testtools
  Using cached testtools-2.5.0-py3-none-any.whl (181 kB)
Collecting python-subunit
  Using cached python_subunit-1.4.2-py3-none-any.whl (106 kB)
Collecting testscenarios
  Using cached testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting fastimport
  Using cached fastimport-0.9.14-py2.py3-none-any.whl
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting docutils
  Using cached docutils-0.19-py3-none-any.whl (570 kB)
Collecting sphinx-epytext
  Using cached sphinx_epytext-0.0.4-py3-none-any.whl
Collecting sphinx
  Using cached sphinx-5.3.0-py3-none-any.whl (3.2 MB)
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.1.dev0) (2.12.0)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: httplib2 in /usr/lib/python3/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (0.20.4)
Requirement already satisfied: keyring in /usr/local/lib/python3.10/dist-packages (from launchpadlib>=1.6.3->breezy==3.3.1.dev0) (23.11.0)
Requirement already satisfied: lazr.restfulclient>=0.9.19 in /us...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.tcwe24s0
  Installing build dependencies: started
  Installing build dependencies: still running...
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.1.dev0) (2.12.0)
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 21.4 kB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Collecting python-subunit
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 67.3 kB/s eta 0:00:00
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 138.6 kB/s eta 0:00:00
Collecting docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 130.9 kB/s eta 0:00:00
Collecting sphinx
  Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 304.5 kB/s eta 0:00:00
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Prepa...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.psm2dx6o
  Installing build dependencies: started
  Installing build dependencies: still running...
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 30.2 kB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: paramiko in /usr/local/lib/python3.10/dist-packages (from breezy==3.3.1.dev0) (2.12.0)
Collecting sphinx
  Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 188.7 kB/s eta 0:00:00
Collecting docutils
  Downloading docutils-0.19-py3-none-any.whl (570 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 570.5/570.5 kB 304.4 kB/s eta 0:00:00
Requirement already satisfied: setuptools in ./lib/python3.10/site-packages (from breezy==3.3.1.dev0) (65.5.0)
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 18...

[The Breezy Bot (the-breezy-bot)]

The attempt to merge lp:brz/3.3 into lp:brz failed. Command exited with 142.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.1-py3-none-any.whl (10 kB)
Requirement already satisfied: setuptools>=46.1 in ./lib/python3.10/site-packages (from setuptools-gettext) (65.5.0)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.1
Obtaining file:///tmp/tarmac/branch.4jwt249v
  Installing build dependencies: started
  Installing build dependencies: still running...
  Installing build dependencies: finished with status 'done'
  Checking if build backend supports build_editable: started
  Checking if build backend supports build_editable: finished with status 'done'
  Getting requirements to build editable: started
  Getting requirements to build editable: finished with status 'done'
  Preparing editable metadata (pyproject.toml): started
  Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.12)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.0.8)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.26.12)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.2.3)
Requirement already satisfied: configobj in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.6)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (6.0)
Requirement already satisfied: dulwich>=0.20.46 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (0.20.50)
Collecting python-subunit
  Downloading python_subunit-1.4.2-py3-none-any.whl (106 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 106.8/106.8 kB 65.8 kB/s eta 0:00:00
Collecting testtools
  Downloading testtools-2.5.0-py3-none-any.whl (181 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 182.0/182.0 kB 72.1 kB/s eta 0:00:00
Collecting testscenarios
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Requirement already satisfied: flake8 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (5.0.4)
Requirement already satisfied: launchpadlib>=1.6.3 in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.10.17)
Requirement already satisfied: gpg in /usr/lib/python3/dist-packages (from breezy==3.3.1.dev0) (1.18.0)
Collecting fastimport
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 41.8/41.8 kB 107.1 kB/s eta 0:00:00
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx-epytext
  Downloading sphinx-epytext-0.0.4.tar.gz (3.6 kB)
  Preparing metadata (setup.py): started
  Preparing metadata (setup.py): finished with status 'done'
Collecting sphinx
  Downloading sphinx-5.3.0-py3-none-any.whl (3.2 MB)
     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.2/3.2 MB 174.2 kB/s eta 0:00:00
Requirement already satisfied: setuptools in ./lib/python3.10/site-package...

[lp:brz/3.3]

7736. By Jelmer Vernooij on 2022-11-19

Skip tests that often hang.

by jelmer review by jelmer

7737. By Jelmer Vernooij on 2022-11-19

More portability fixes for Windows, Mac OS X.

by jelmer review by jelmer

7738. By Jelmer Vernooij on 2022-11-19

Drop references to brz-gtk.

by jelmer review by jelmer

7739. By Jelmer Vernooij on 2022-11-19

Improve brz-email docs.

by jelmer review by jelmer

7740. By Jelmer Vernooij on 2022-11-20

Drop reference to Bazaar in 'brz plugins'.

by jelmer review by jelmer

7741. By Jelmer Vernooij on 2022-11-20

Increase timeout for single test.

by jelmer review by jelmer

7742. By Jelmer Vernooij on 2022-11-22

Update release notes for 3.3.1.

by jelmer review by jelmer

7743. By Jelmer Vernooij on 2022-11-22

Support [] in email addresses.

by jelmer review by jelmer

7744. By Jelmer Vernooij on 2022-11-22

Release 3.3.1

by jelmer review by jelmer

=== modified file '.github/workflows/pythonpackage.yml'
--- .github/workflows/pythonpackage.yml	2022-11-06 23:07:07 +0000
+++ .github/workflows/pythonpackage.yml	2022-11-22 15:53:18 +0000
@@ -16,6 +16,9 @@
           - os: macos-latest
             experimental: true
             python-version: 3.7
+          - os: windows-latest
+            python-version: 3.7
+            experimental: true
 # See https://github.com/actions/toolkit/issues/399
 #        include:
 #          - os: ubuntu-latest
@@ -40,11 +43,14 @@
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -U pip "setuptools>=60" setuptools-gettext
-          pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils sphinx sphinx_epytext launchpadlib patiencediff git+https://github.com/dulwich/dulwich setuptools-rust pyyaml merge3 mypy
+          python -m pip install -U pip "setuptools>=60" setuptools-gettext cython setuptools-rust
+          python -m pip install -U pip coverage codecov cython testscenarios git+https://github.com/dulwich/dulwich
+          python -m pip install ".[dev,paramiko,doc,launchpad,git,fastimport]"
       - name: Install dependencies (linux/pip)
         run: |
-          python -m pip install pyinotify
+          sudo apt install libgpgme-dev
+          pip install pyinotify
+          pip install ".[workspace,pgp]"
         if: "matrix.os == 'ubuntu-latest'"
       - name: Build docs
         run: |
@@ -53,14 +59,32 @@
         run: |
           make extensions PYTHON=python
         if: "matrix.python-version != 'pypy3'"
-      - name: Test suite run
+      - name: Test suite run (Linux)
         run: |
           ./brz selftest
         env:
           PYTHONHASHSEED: random
           BRZ_PLUGIN_PATH: -site:-user
           PYTHONPATH: .
+        if: "matrix.os == 'ubuntu-latest'"
+      - name: Test suite run (Mac OS)
+        run: |
+          ./brz selftest --subunit2 | subunit-filter --fixup-expected-failures=xfail.macos -s --passthrough | subunit2pyunit
+        env:
+          PYTHONHASHSEED: random
+          BRZ_PLUGIN_PATH: -site:-user
+          PYTHONPATH: .
+        if: "matrix.os == 'macos-latest'"
+      - name: Test suite run (Windows)
+        run: |
+          python -m breezy selftest --subunit2 | subunit-filter --fixup-expected-failures=xfail.windows -s --passthrough | subunit2pyunit
+        env:
+          PYTHONHASHSEED: random
+          BRZ_PLUGIN_PATH: -site:-user
+          PYTHONPATH: .
+        if: "matrix.os == 'windows-latest'"
       - name: Run mypy
         run: |
-          python -m pip install types-PyYAML types-paramiko types-setuptools
+          python -m pip install mypy types-PyYAML types-paramiko types-setuptools
           python -m mypy breezy
+        if: "matrix.python-version != 'pypy3'"

=== modified file 'Makefile'
--- Makefile	2022-10-30 03:53:57 +0000
+++ Makefile	2022-11-22 15:53:18 +0000
@@ -277,7 +277,7 @@
 		)
 
 po/brz.pot: $(PYFILES) $(DOCFILES)
-	$(PYTHON) ./brz export-pot --include-duplicates > po/brz.pot
+	./brz export-pot --include-duplicates > po/brz.pot
 	echo $(TRANSLATABLE_PYFILES) | xargs \
 	  xgettext --package-name "brz" \
 	  --msgid-bugs-address "<[e-mail]>" \

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2022-10-27 11:57:11 +0000
+++ breezy/__init__.py	2022-11-22 15:53:18 +0000
@@ -51,7 +51,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (3, 3, 1, 'dev', 0)
+version_info = (3, 3, 1, 'final', 0)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/__main__.py'
--- breezy/__main__.py	2022-10-27 19:28:31 +0000
+++ breezy/__main__.py	2022-11-22 15:53:18 +0000
@@ -19,7 +19,6 @@
 
 import os
 import sys
-import warnings
 
 
 profiling = False

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2022-11-15 10:35:17 +0000
+++ breezy/builtins.py	2022-11-22 15:53:18 +0000
@@ -2658,8 +2658,8 @@
     :Tips & tricks:
 
       GUI tools and IDEs are often better at exploring history than command
-      line tools: you may prefer qlog or viz from qbzr or brz-gtk, the
-      bzr-explorer shell, or the Loggerhead web interface.  See the Breezy
+      line tools: you may prefer qlog from qbzr, or the Loggerhead web
+      interface.  See the Breezy
       Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/> and
       <http://wiki.breezy-vcs.org/IDEIntegration>.
 
@@ -5207,7 +5207,7 @@
     adding new commands, providing additional network transports and
     customizing log output.
 
-    See the Bazaar Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>
+    See the Breezy Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>
     for further information on plugins including where to find them and how to
     install them. Instructions are also provided there on how to write new
     plugins using the Python programming language.

=== modified file 'breezy/config.py'
--- breezy/config.py	2022-11-13 20:26:24 +0000
+++ breezy/config.py	2022-11-22 15:53:18 +0000
@@ -1424,9 +1424,12 @@
         return self._get_best_value('_acceptable_keys')
 
 
+_username_re = lazy_regex.lazy_compile(r'(.*?)\s*<?([\[\]\w+.-]+@[\w+.-]+)>?')
+
+
 def parse_username(username):
     """Parse e-mail username and return a (name, address) tuple."""
-    match = re.match(r'(.*?)\s*<?([\w+.-]+@[\w+.-]+)>?', username)
+    match = _username_re.match(username)
     if match is None:
         return (username, '')
     return (match.group(1), match.group(2))
@@ -2644,7 +2647,7 @@
                               'breezy.smtp_connection', 'smtp_username')
 option_registry.register(
     Option('selftest.timeout',
-           default='600',
+           default='1200',
            from_unicode=int_from_store,
            help='Abort selftest if one test takes longer than this many seconds',
            ))

=== modified file 'breezy/plugins/email/__init__.py'
--- breezy/plugins/email/__init__.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/email/__init__.py	2022-11-22 15:53:18 +0000
@@ -15,25 +15,21 @@
 
 """Sending emails for commits and branch changes.
 
-To have bzr send an email you need to configure an address to send mail
+To have Breezy send an email you need to configure an address to send mail
 to for that branch. To do this set the configuration option ``post_commit_to``
 and the address to send the mail from is read from the configuration option
 ``post_commit_sender`` (if not supplied defaults to the email address reported
-by ``bzr whoami``).
+by ``brz whoami``).
 
 By default, the diff for the commit will be included in the email if the
 length is less than 1000 lines. This limit can be changed by setting the
 configuration option 'post_commit_difflimit' to the number of lines you wish
 it to be limited to. Set it to 0 to unconditionally disable sending of diffs.
 
-By default bzr-email only emails when a commit occurs, not when a push or
+By default emails are sent only when a commit occurs, not when a push or
 pull operation occurs. To email on push or pull set post_commit_push_pull=True
 in the configuration.
 
-If you are using a bzr release from before 0.15, you need to manually tell
-bzr about the commit action, by setting
-post_commit=breezy.plugins.email.post_commit in breezy.conf or locations.conf.
-
 The URL of the branch is determined from the following checks (in order):
  - If the configuration value 'post_commit_url' is set, it is used.
  - If the configuration value 'public_branch' is set, it is used.
@@ -62,6 +58,10 @@
 like::
 
   revision_mail_headers=X-Cheese: to the rescue!
+
+Other supported options (use ``brz help <option>`` for more information)
+are: post_commit_body, post_commit_subject, post_commit_log_format,
+post_commit_diffoptions, post_commit_sender, post_commit_to.
 """
 
 from ... import version_info  # noqa: F401
@@ -121,6 +121,6 @@
 
 from ...hooks import install_lazy_named_hook
 install_lazy_named_hook("breezy.branch", "Branch.hooks", 'post_commit',
-                        branch_commit_hook, 'bzr-email')
+                        branch_commit_hook, 'email')
 install_lazy_named_hook("breezy.branch", "Branch.hooks",
-                        'post_change_branch_tip', branch_post_change_hook, 'bzr-email')
+                        'post_change_branch_tip', branch_post_change_hook, 'email')

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2022-11-03 17:51:29 +0000
+++ breezy/plugins/propose/cmds.py	2022-11-22 15:53:18 +0000
@@ -220,11 +220,11 @@
             note(gettext('There is already a branch merge proposal: %s'), e.url)
         else:
             note(gettext('Merge proposal created: %s') % proposal.url)
+            web_url = proposal.get_web_url()
+            note(gettext('Opening %s in web browser'), web_url)
             if open:
-                web_url = proposal.get_web_url()
-            note(gettext('Opening %s in web browser'), web_url)
-            import webbrowser
-            webbrowser.open(web_url)
+                import webbrowser
+                webbrowser.open(web_url)
 
 
 class cmd_find_merge_proposal(Command):

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2022-11-13 20:26:24 +0000
+++ breezy/tests/__init__.py	2022-11-22 15:53:18 +0000
@@ -952,7 +952,7 @@
         # set by the user running selftest).
         timeout = config.GlobalStack().get('selftest.timeout')
         if timeout:
-            timeout_fixture = fixtures.TimeoutFixture(timeout)
+            timeout_fixture = fixtures.TimeoutFixture(timeout, gentle=True)
             timeout_fixture.setUp()
             self.addCleanup(timeout_fixture.cleanUp)
 

=== modified file 'breezy/tests/blackbox/test_big_file.py'
--- breezy/tests/blackbox/test_big_file.py	2021-08-21 13:02:55 +0000
+++ breezy/tests/blackbox/test_big_file.py	2022-11-22 15:53:18 +0000
@@ -21,6 +21,7 @@
 memory.
 """
 
+import contextlib
 import errno
 import os
 import resource
@@ -52,6 +53,16 @@
         os.close(fd)
 
 
[e-mail]
+def limit_memory(size):
+    if sys.platform in ('win32', 'darwin'):
+        raise NotImplementedError
+    previous = resource.getrlimit(RESOURCE)
+    resource.setrlimit(RESOURCE, (LIMIT, -1))
+    yield
+    resource.setrlimit(RESOURCE, previous)
+
+
 class TestAdd(tests.TestCaseWithTransport):
 
     def writeBigFile(self, path):
@@ -64,9 +75,12 @@
 
     def setUp(self):
         super(TestAdd, self).setUp()
-        previous = resource.getrlimit(RESOURCE)
-        self.addCleanup(resource.setrlimit, RESOURCE, previous)
-        resource.setrlimit(RESOURCE, (LIMIT, -1))
+        cm = limit_memory(LIMIT)
+        try:
+            cm.__enter__()
+        except NotImplementedError:
+            self.skipTest('memory limits not supported on this platform')
+        self.addCleanup(cm.__exit__, None, None, None)
 
     def test_allocate(self):
         def allocate():

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2021-12-25 15:47:06 +0000
+++ breezy/tests/blackbox/test_branch.py	2022-11-22 15:53:18 +0000
@@ -555,6 +555,7 @@
 
     def setUp(self):
         super(TestRemoteBranch, self).setUp()
+        self.skipTest('tests often hang - see pad.lv/1997033')
         tree = self.make_branch_and_tree('branch')
         self.build_tree_contents([('branch/file', b'file content\n')])
         tree.add('file')

=== modified file 'breezy/tests/fixtures.py'
--- breezy/tests/fixtures.py	2022-07-02 16:15:20 +0000
+++ breezy/tests/fixtures.py	2022-11-22 15:53:18 +0000
@@ -24,7 +24,7 @@
 should be passed to `addCleanup` on the test.
 """
 
-
+from contextlib import ExitStack
 import itertools
 
 
@@ -140,21 +140,41 @@
     return tree
 
 
+class TimeoutException(Exception):
+    """Timeout expired"""
+
+
 class TimeoutFixture(object):
     """Kill a test with sigalarm if it runs too long.
 
     Only works on Unix at present.
     """
 
-    def __init__(self, timeout_secs):
+    def __init__(self, timeout_secs, gentle=True):
         import signal
         self.timeout_secs = timeout_secs
         self.alarm_fn = getattr(signal, 'alarm', None)
+        self.gentle = gentle
+        self._es = ExitStack()
+
+    def signal_handler(self, signum, frame):
+        raise TimeoutException(self.timeout_secs)
 
     def setUp(self):
-        if self.alarm_fn is not None:
-            self.alarm_fn(self.timeout_secs)
+        import signal
+        if self.alarm_fn is None:
+            return
+        if self.gentle:
+            # Install a handler for SIGARLM so we can raise an exception rather
+            # than the default handler executing, which kills the process.
+            old_handler = signal.signal(signal.SIGALRM, self.signal_handler)
+        # We add the alarm cleanup before the cleanup for the signal handler,
+        # otherwise there is a race condition where the signal handler is
+        # cleaned up but the alarm still fires.
+        self._es.callback(self.alarm_fn, 0)
+        self.alarm_fn(self.timeout_secs)
+        if self.gentle:
+            self._es.callback(signal.signal, signal.SIGALRM, old_handler)
 
     def cleanUp(self):
-        if self.alarm_fn is not None:
-            self.alarm_fn(0)
+        self._es.close()

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2022-10-28 18:05:19 +0000
+++ breezy/tests/test_config.py	2022-11-22 15:53:18 +0000
@@ -1527,6 +1527,8 @@
                          config.parse_username('John Doe'))
         self.assertEqual(('John Doe', '[e-mail]'),
                          config.parse_username('John Doe [e-mail]'))
+        self.assertEqual(('John Doe', 'jdoe[bot]@example.com'),
+                         config.parse_username('John Doe <jdoe[bot]@example.com>'))
 
 
 class TestTreeConfig(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/test_msgeditor.py'
--- breezy/tests/test_msgeditor.py	2022-11-05 18:34:06 +0000
+++ breezy/tests/test_msgeditor.py	2022-11-22 15:53:18 +0000
@@ -198,6 +198,7 @@
         else:
             # [non-win32] make python script executable and set BRZ_EDITOR
             os.chmod('fed.py', 0o755)
+            mutter('Setting BRZ_EDITOR to %r', '%s ./fed.py' % sys.executable)
             self.overrideEnv('BRZ_EDITOR', '%s ./fed.py' % sys.executable)
 
     def test_edit_commit_message_without_infotext(self):

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2022-10-08 06:44:12 +0000
+++ doc/developers/releasing.txt	2022-11-22 15:53:18 +0000
@@ -56,35 +56,23 @@
 When do we release ?
 ====================
 
-As of May 2020, we maintain a two series: 3.1 and trunk (3.2).
+As of 2022, we maintain a two series: 3.3 and trunk (4.0).
 
 #. as much as possible releases should not disturb development, and
    ongoing development should not disturb releases,
 
-#. the most recent development series should release once a month during
-   the beta period (see `Development cycles <cycle.html>`_ for more
+#. the most recent development series should ideally release once a month
+   during the beta period (see `Development cycles <cycle.html>`_ for more
    details),
 
-#. the most recent stable series should release every other month (based
-   on the amount of bug fixes, this can be shorter or longer depending on
-   the bugs importance),
+#. as capacity allows, the most recent stable series should release every
+   other month (based on the amount of bug fixes, this can be shorter or
+   longer depending on the bugs importance),
 
 #. previous series should release on a regular basis without interfering
    with the most recent series with a decreasing order of priority (again
    this should be based on bugs importance and user feedback),
 
-#. the death of a series should be planned ahead of time. 6 months should
-   give enough time to our users to migrate to a more recent series. This
-   doesn't mean we will make a release at the end of the series, just that
-   before the end date we *could* possibly put out another release if
-   there was a sufficiently important fix.  Beyond that date, we won't
-   even land changes on that branch (unless something causes a miraculous
-   resurrection.)
-
-#. there should not be more than 2 releases in the same week (but the
-   Release Manager is free to ignore this (get in touch with packagers
-   though),
-
 At the start of a series cycle
 ==============================
 
@@ -140,9 +128,9 @@
 
 #. Update the version number in the ``brz`` script, and the
    ``breezy/__init__.py`` file::
-   
+
        version_info = (x, y, z, 'dev', 0)
-   
+
 #. Add a new section at the top of the current release notes (in
    ``doc/en/release-notes``) about the new release, including its version
    number and the headings from ``release-template.txt``.
@@ -289,20 +277,20 @@
       @@ -52,7 +52,7 @@
        # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
        # releaselevel of 'dev' for unreleased under-development code.
-       
+
       -version_info = (2, 3, 1, 'dev', 0)
       +version_info = (2, 3, 1, 'final', 0)
-       
+
        # API compatibility version
        api_minimum_version = (2, 3, 0)
-      
+
       === modified file 'doc/en/release-notes/brz-2.3.txt'
       --- doc/en/release-notes/brz-2.3.txt	2011-03-09 08:30:16 +0000
       +++ doc/en/release-notes/brz-2.3.txt	2011-03-10 10:40:47 +0000
       @@ -8,23 +8,10 @@
        brz 2.3.1
        #########
-       
+
       -:2.3.1: NOT RELEASED YET
       -
       -External Compatibility Breaks

=== modified file 'doc/en/mini-tutorial/index.txt'
--- doc/en/mini-tutorial/index.txt	2022-03-20 13:15:27 +0000
+++ doc/en/mini-tutorial/index.txt	2022-11-22 15:53:18 +0000
@@ -189,16 +189,16 @@
 To work with someone else's code, you can make your own copy of their
 branch. Let's take a real-world example, Breezy's GTK interface::
 
-  $ brz init-shared-repo ~/brz-gtk
-  $ brz branch lp:~brz/brz-gtk/trunk ~/brz-gtk/john
+  $ brz init-shared-repo ~/bzr-gtk
+  $ brz branch lp:~brz/bzr-gtk/trunk ~/bzr-gtk/john
   Branched 292 revision(s).
 
 Breezy will download all the files and complete revision history from the
-brz-gtk project's trunk branch and create a copy called ``john``.
+bzr-gtk project's trunk branch and create a copy called ``john``.
 
 Now, you have your own copy of the branch and can commit changes with
 or without a net connection. You can share your branch at any time by
-publishing it and, if the  brz-gtk team want to use your work, Breezy
+publishing it and, if the  bzr-gtk team want to use your work, Breezy
 makes it easy for them to merge your branch back into their trunk branch.
 
 
@@ -212,7 +212,7 @@
 the parent into your personal branch::
 
   $ brz merge
-  Merging from saved parent location: http://bazaar.launchpad.net/~brz/brz-gtk/trunk
+  Merging from saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
   All changes applied successfully.
 
 Check what has changed::

=== modified file 'doc/en/release-notes/brz-3.3.txt'
--- doc/en/release-notes/brz-3.3.txt	2022-10-08 07:04:57 +0000
+++ doc/en/release-notes/brz-3.3.txt	2022-11-22 15:53:18 +0000
@@ -8,47 +8,117 @@
 brz 3.3.1
 #########
 
-:3.3.1: NOT RELEASED YET
+:3.3.1: 2022-11-22
 
 External Compatibility Breaks
 *****************************
 
 .. These may require users to change the way they use Breezy.
 
+* Drop support for Python < 3.7. (Jelmer Vernooij)
+
+* Factored gettext support out into setuptools-gettext. (Jelmer Vernooij)
+
 New Features
 ************
 
 .. New commands, options, etc that users may wish to try out.
 
+* Add ``--open`` argument to ``brz propose``. (Jelmer Vernooij)
+
+* New ``brz web-open`` command, which opens a branch or
+  merge proposal in a web browser. Deprecates ``brz lp-open``.
+  (Jelmer Vernooij)
+
 Improvements
 ************
 
 .. Improvements to existing commands, especially improved performance
    or memory usage, or better results.
 
+* Various portability fixes for Mac OS X and Windows. (Jelmer Vernooij)
+
+* Ship typing hints. (Jelmer Vernooij)
+
+* Build binary on GitHub for most Python platforms.
+  (Jelmer Vernooij)
+
+* Drop trivial pkg-version dependency. (Ondřej Pohořelský)
+
+* Drop use of unnecessary ``iso8061`` module for Forge interactions.
+  (Jelmer Vernooij)
+
+* Support finding GitHub PRs by URL. (Jelmer Vernooij)
+
 Bug Fixes
 *********
 
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
+* Fix compatibility with Python 3.11. (Jelmer Vernooij, #1995814)
+  + Remove use of PyUnicode_FromUnicode, gone in Python 3.11.
+  + Fix reference counter tests for Python 3.11.
+
+* Handle unexpected HTTP Status errors from Dulwich, converting them
+  to the appropriate Breezy exceptions. (Jelmer Vernooij)
+
+* Handle out of file descriptor errors in ``breezy.dirty_tracker``.
+  (Jelmer Vernooij)
+
+* git: Properly decode remote tag names rather than leaving them as bytes.
+  (Jelmer Vernooij)
+
+* Fix compatibility with Dulwich >= 0.20.50. (Jelmer Vernooij)
+
+* Fix ``Tree.get_file_mtime`` in shallow git trees. (Jelmer Vernooij)
+
 Documentation
 *************
 
 .. Improved or updated documentation.
 
+* Remove various references to brz-gtk and breezy.
+  (Jelmer Vernooij, #1926890, #1837056, #1837053)
+
 API Changes
 ***********
 
 .. Changes that may require updates in plugins or other code that uses
    breezy.
 
+* Removed ``breezy.revision.ensure_null``, originally added for
+  the migation from ``None`` to ``NULL_REVISION``. (Jelmer Vernooij)
+
+* New ``Forge.create_project`` method. (Jelmer Vernooij)
+
+* New ``breezy.forge.get_forge_by_hostname`` function.
+  (Jelmer Vernooij)
+
+* New ``Tree.is_special_filename`` to match on e.g.
+  ``.gitattributes`` and ``.bzrignore``. (Jelmer Vernooij)
+
 Internals
 *********
 
 .. Major internal changes, unlikely to be visible to users or plugin
    developers, but interesting for brz developers.
 
+* Switch to using Launchpad REST API for lp: URL lookups,
+  rather than XML/RPC. (Jelmer Vernooij)
+
+* Migrate from pkg_resources to importlib for entrypoints.
+  (Jelmer Vernooij)
+
+* New exception ``UnsupportedVcs``. (Jelmer Vernooij)
+
+* Support titles for merge proposals. (Jelmer Vernooij)
+
+* Use standard python infrastructure to mark extensions as
+  optional. (Jelmer Vernooij)
+
+* Add pyproject.toml. (Jelmer Vernooij)
+
 Testing
 *******
 
@@ -56,6 +126,16 @@
    suite.  This can include new facilities for writing tests, fixes to
    spurious test failures and changes to the way things should be tested.
 
+* Increased timeouts since e.g. the setup test takes longer to run
+  now we're compiling rust files. (Jelmer Vernooij)
+
+* Raise exception for timed out test rather than killing entire process
+  when hitting timeouts. (Jelmer Vernooij)
+
+* Add xfail lists for Mac OS X and Windows. (Jelmer Vernooij)
+
+* Properly clear BRZ_SSH in tests. (Jelmer Vernooij)
+
 brz 3.3.0
 #########
 

=== modified file 'doc/en/user-guide/annotating_changes.txt'
--- doc/en/user-guide/annotating_changes.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/annotating_changes.txt	2022-11-22 15:53:18 +0000
@@ -23,11 +23,11 @@
 ---------
 
 The various GUI plugins for Breezy provide graphical tools for
-viewing annotation information. For example, the brz-gtk plugin
+viewing annotation information. For example, the qbrz plugin
 provides a GUI tool for this that can be launched using the
-``gannotate`` command::
+``qannotate`` command::
 
-  brz gannotate readme.txt
+  brz qannotate readme.txt
 
 The GUI tools typically provide a much richer display of
 interesting information (e.g. all the changes in each commit)

=== modified file 'doc/en/user-guide/browsing_history.txt'
--- doc/en/user-guide/browsing_history.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/browsing_history.txt	2022-11-22 15:53:18 +0000
@@ -87,17 +87,9 @@
 
 History browsing is one area where GUI tools really make life easier.
 Breezy has numerous plug-ins that provide this capability including
-QBzr and brz-gtk. See `Using plugins <plugins.html>`_ for details on how to install
+QBzr. See `Using plugins <plugins.html>`_ for details on how to install
 these if they are not already installed.
 
 To use the graphical viewer from QBzr::
 
   brz qlog
-
-To use the graphical viewer from brz-gtk::
-
-  brz viz
-
-``viz`` is actually a built-in alias for ``visualize`` so use the longer
-command name if you prefer.
-

=== modified file 'doc/en/user-guide/plugins.txt'
--- doc/en/user-guide/plugins.txt	2022-03-20 13:15:27 +0000
+++ doc/en/user-guide/plugins.txt	2022-11-22 15:53:18 +0000
@@ -84,8 +84,6 @@
   Category         Name              Description
   ================ ================= ==================================
   GUI              QBzr              Qt-based GUI tools
-  GUI              brz-gtk           GTK-based GUI tools
-  GUI              brz-eclipse       Eclipse integration
   General          brztools          misc. enhancements including shelf
   General          difftools         external diff tool helper
   General          extmerge          external merge tool helper
@@ -93,6 +91,9 @@
   Migration        cvsps             migrate CVS patch-sets
   ================ ================= ==================================
 
+Note that there are also a number of plugins for Bazaar that have
+not yet been ported to Python 3 and Breezy.
+
 If you wish to write your own plugins, it is not difficult to do.
 See `Writing a plugin <writing a plugin.html>`_ in the appendices to get
-started.
+started. See http://doc.bazaar.canonical.com/plugins/en/ for details.

=== modified file 'po/brz.pot'
--- po/brz.pot	2021-11-17 20:30:19 +0000
+++ po/brz.pot	2022-11-22 15:53:18 +0000
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical
+# Copyright (C) YEAR Breezy Developers
 # This file is distributed under the same license as the brz package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: brz\n"
-"Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2021-05-03 13:48+0100\n"
+"Report-Msgid-Bugs-To: <[e-mail]>\n"
+"POT-Creation-Date: 2022-11-22 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -108,79 +108,79 @@
 msgid "Write log to this file."
 msgstr ""
 
-#: breezy/branch.py:822
+#: breezy/branch.py:852
 msgid "Unstacking"
 msgstr ""
 
-#: breezy/branch.py:2003
+#: breezy/branch.py:2055
 #, python-format
 msgid "Pushed up to revision %d."
 msgstr ""
 
-#: breezy/branch.py:2006
+#: breezy/branch.py:2058
 #, python-format
 msgid "Pushed up to revision id %s."
 msgstr ""
 
-#: breezy/branch.py:2009
+#: breezy/branch.py:2061
 #, python-format
 msgid "%d tag updated."
 msgid_plural "%d tags updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/branch.py:2013
+#: breezy/branch.py:2065
 msgid "No new revisions or tags to push."
 msgstr ""
 
-#: breezy/branch.py:2015
+#: breezy/branch.py:2067
 msgid "No new revisions to push."
 msgstr ""
 
-#: breezy/branch.py:2035
+#: breezy/branch.py:2088
 #, python-brace-format
 msgid "checked branch {0} format {1}"
 msgstr ""
 
-#: breezy/branch.py:2038
+#: breezy/branch.py:2091
 #, python-format
 msgid "found error:%s"
 msgstr ""
 
-#: breezy/builtins.py:253 breezy/builtins.py:3084 breezy/workingtree.py:249
+#: breezy/builtins.py:252 breezy/builtins.py:3082 breezy/workingtree.py:254
 #, python-format
 msgid "Ignoring files outside view. View is %s"
 msgstr ""
 
-#: breezy/builtins.py:263
+#: breezy/builtins.py:262
 #, python-format
 msgid "brz %s --revision takes exactly one revision identifier"
 msgstr ""
 
-#: breezy/builtins.py:318
+#: breezy/builtins.py:317
 msgid "Display status summary."
 msgstr ""
 
-#: breezy/builtins.py:320
+#: breezy/builtins.py:319
 msgid ""
 "This reports on versioned and unknown files, reporting them\n"
 "grouped by state.  Possible states are:"
 msgstr ""
 
-#: breezy/builtins.py:323
+#: breezy/builtins.py:322
 msgid ""
 "added\n"
 "    Versioned in the working copy but not in the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:326
+#: breezy/builtins.py:325
 msgid ""
 "removed\n"
 "    Versioned in the previous revision but removed or deleted\n"
 "    in the working copy."
 msgstr ""
 
-#: breezy/builtins.py:330
+#: breezy/builtins.py:329
 msgid ""
 "renamed\n"
 "    Path of this file changed from the previous revision;\n"
@@ -188,25 +188,25 @@
 "    parent directory was renamed."
 msgstr ""
 
-#: breezy/builtins.py:335
+#: breezy/builtins.py:334
 msgid ""
 "modified\n"
 "    Text has changed since the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:338
+#: breezy/builtins.py:337
 msgid ""
 "kind changed\n"
 "    File kind has been changed (e.g. from file to directory)."
 msgstr ""
 
-#: breezy/builtins.py:341
+#: breezy/builtins.py:340
 msgid ""
 "unknown\n"
 "    Not versioned and not matching an ignore pattern."
 msgstr ""
 
-#: breezy/builtins.py:344
+#: breezy/builtins.py:343
 msgid ""
 "Additionally for directories, symlinks and files with a changed\n"
 "executable bit, Breezy indicates their type using a trailing\n"
@@ -214,20 +214,20 @@
 "disabled using the '--no-classify' option."
 msgstr ""
 
-#: breezy/builtins.py:349
+#: breezy/builtins.py:348
 msgid ""
 "To see ignored files use 'brz ignored'.  For details on the\n"
 "changes to file texts, use 'brz diff'."
 msgstr ""
 
-#: breezy/builtins.py:352
+#: breezy/builtins.py:351
 msgid ""
 "Note that --short or -S gives status flags for each item, similar\n"
 "to Subversion's status command. To get output similar to svn -q,\n"
 "use brz status -SV."
 msgstr ""
 
-#: breezy/builtins.py:356
+#: breezy/builtins.py:355
 msgid ""
 "If no arguments are specified, the status of the entire working\n"
 "directory is shown.  Otherwise, only the status of the specified\n"
@@ -235,7 +235,7 @@
 "is reported for everything inside that directory."
 msgstr ""
 
-#: breezy/builtins.py:361
+#: breezy/builtins.py:360
 msgid ""
 "Before merges are committed, the pending merge tip revisions are\n"
 "shown. To see all pending merge revisions, use the -v option.\n"
@@ -243,13 +243,13 @@
 "the no-pending option or specify a file/directory."
 msgstr ""
 
-#: breezy/builtins.py:366
+#: breezy/builtins.py:365
 msgid ""
 "To compare the working directory to a specific revision, pass a\n"
 "single revision to the revision argument."
 msgstr ""
 
-#: breezy/builtins.py:369
+#: breezy/builtins.py:368
 msgid ""
 "To see which files have changed in a specific revision, or between\n"
 "two revisions, pass a revision range to the revision argument.\n"
@@ -257,132 +257,132 @@
 msgstr ""
 
 # help of 'short' option of 'status' command
-#: breezy/builtins.py:378
+#: breezy/builtins.py:377
 msgid "Use short status indicators."
 msgstr ""
 
 # help of 'versioned' option of 'status' command
-#: breezy/builtins.py:380
+#: breezy/builtins.py:379
 msgid "Only show versioned files."
 msgstr ""
 
 # help of 'no-pending' option of 'status' command
-#: breezy/builtins.py:382
+#: breezy/builtins.py:381
 msgid "Don't show pending merges."
 msgstr ""
 
 # help of 'no-classify' option of 'status' command
-#: breezy/builtins.py:384
+#: breezy/builtins.py:383
 msgid "Do not mark object type using indicator."
 msgstr ""
 
-#: breezy/builtins.py:399
+#: breezy/builtins.py:398
 msgid "brz status --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:443 breezy/builtins.py:5321
+#: breezy/builtins.py:442 breezy/builtins.py:5319
 msgid "You can only supply one of revision_id or --revision"
 msgstr ""
 
-#: breezy/builtins.py:447 breezy/builtins.py:5324
+#: breezy/builtins.py:446 breezy/builtins.py:5322
 msgid "You must supply either --revision or a revision_id"
 msgstr ""
 
-#: breezy/builtins.py:454
+#: breezy/builtins.py:453
 #, python-format
 msgid "Repository %r does not support access to raw revision texts"
 msgstr ""
 
-#: breezy/builtins.py:465
+#: breezy/builtins.py:464
 #, python-brace-format
 msgid "The repository {0} contains no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:472
+#: breezy/builtins.py:471
 msgid "You cannot specify a NULL revision."
 msgstr ""
 
-#: breezy/builtins.py:478
+#: breezy/builtins.py:477
 msgid "Remove the working tree from a given branch/checkout."
 msgstr ""
 
-#: breezy/builtins.py:480
+#: breezy/builtins.py:479
 msgid ""
 "Since a lightweight checkout is little more than a working tree\n"
 "this will refuse to run against one."
 msgstr ""
 
-#: breezy/builtins.py:483
+#: breezy/builtins.py:482
 msgid "To re-create the working tree, use \"brz checkout\"."
 msgstr ""
 
 # help of 'force' option of 'remove-tree' command
-#: breezy/builtins.py:489
+#: breezy/builtins.py:488
 msgid "Remove the working tree even if it has uncommitted or shelved changes."
 msgstr ""
 
-#: breezy/builtins.py:504
+#: breezy/builtins.py:503
 msgid "No working tree to remove"
 msgstr ""
 
-#: breezy/builtins.py:507
+#: breezy/builtins.py:506
 msgid "You cannot remove the working tree of a remote path"
 msgstr ""
 
-#: breezy/builtins.py:517
+#: breezy/builtins.py:516
 msgid "You cannot remove the working tree from a lightweight checkout"
 msgstr ""
 
-#: breezy/builtins.py:558
+#: breezy/builtins.py:557
 msgid ""
 "The tree does not appear to be corrupt. You probably want \"brz revert\" "
 "instead. Use \"--force\" if you are sure you want to reset the working tree."
 msgstr ""
 
-#: breezy/builtins.py:569
+#: breezy/builtins.py:568
 msgid ""
 ", the header appears corrupt, try passing -r -1 to set the state to the last "
 "commit"
 msgstr ""
 
-#: breezy/builtins.py:574
+#: breezy/builtins.py:573
 #, python-brace-format
 msgid "failed to reset the tree state{0}"
 msgstr ""
 
-#: breezy/builtins.py:578
+#: breezy/builtins.py:577
 msgid "Show current revision number."
 msgstr ""
 
-#: breezy/builtins.py:580
+#: breezy/builtins.py:579
 msgid "This is equal to the number of revisions on this branch."
 msgstr ""
 
-#: breezy/builtins.py:594
+#: breezy/builtins.py:593
 msgid "--tree and --revision can not be used together"
 msgstr ""
 
-#: breezy/builtins.py:610
+#: breezy/builtins.py:609
 msgid "Revision numbers only make sense for single revisions, not ranges"
 msgstr ""
 
 # help of 'tree' option of 'revno' command
-#: breezy/builtins.py:633
+#: breezy/builtins.py:632
 msgid "Show revno of working tree."
 msgstr ""
 
-#: breezy/builtins.py:682
+#: breezy/builtins.py:681
 msgid "Add specified files or directories."
 msgstr ""
 
-#: breezy/builtins.py:684
+#: breezy/builtins.py:683
 msgid ""
 "In non-recursive mode, all the named items are added, regardless\n"
 "of whether they were previously ignored.  A warning is given if\n"
 "any of the named files are already versioned."
 msgstr ""
 
-#: breezy/builtins.py:688
+#: breezy/builtins.py:687
 msgid ""
 "In recursive mode (the default), files are treated the same way\n"
 "but the behaviour for directories is different.  Directories that\n"
@@ -393,19 +393,19 @@
 "directories.  If no names are given '.' is assumed."
 msgstr ""
 
-#: breezy/builtins.py:696
+#: breezy/builtins.py:695
 msgid ""
 "A warning will be printed when nested trees are encountered,\n"
 "unless they are explicitly ignored."
 msgstr ""
 
-#: breezy/builtins.py:699
+#: breezy/builtins.py:698
 msgid ""
 "Therefore simply saying 'brz add' will version all files that\n"
 "are currently unknown."
 msgstr ""
 
-#: breezy/builtins.py:702
+#: breezy/builtins.py:701
 msgid ""
 "Adding a file whose parent directory is not versioned will\n"
 "implicitly add the parent, and so on up to the root. This means\n"
@@ -413,13 +413,13 @@
 "get added when you add a file in the directory."
 msgstr ""
 
-#: breezy/builtins.py:707
+#: breezy/builtins.py:706
 msgid ""
 "--dry-run will show which files would be added, but not actually\n"
 "add them."
 msgstr ""
 
-#: breezy/builtins.py:710
+#: breezy/builtins.py:709
 msgid ""
 "--file-ids-from will try to use the file ids from the supplied path.\n"
 "It looks up ids trying to find a matching parent directory with the\n"
@@ -430,13 +430,13 @@
 "into a subdirectory of this one."
 msgstr ""
 
-#: breezy/builtins.py:718
+#: breezy/builtins.py:717
 msgid ""
 "Any files matching patterns in the ignore list will not be added\n"
 "unless they are explicitly mentioned."
 msgstr ""
 
-#: breezy/builtins.py:721
+#: breezy/builtins.py:720
 msgid ""
 "In recursive mode, files larger than the configuration option\n"
 "add.maximum_file_size will be skipped. Named items are never skipped due\n"
@@ -444,117 +444,117 @@
 msgstr ""
 
 # help of 'no-recurse' option of 'add' command
-#: breezy/builtins.py:728
+#: breezy/builtins.py:727
 msgid "Don't recursively add the contents of directories."
 msgstr ""
 
 # help of 'file-ids-from' option of 'add' command
-#: breezy/builtins.py:736
+#: breezy/builtins.py:735
 msgid "Lookup file ids from this tree."
 msgstr ""
 
-#: breezy/builtins.py:748
+#: breezy/builtins.py:747
 msgid ""
 "Ignoring --file-ids-from, since the tree does not support setting file ids."
 msgstr ""
 
-#: breezy/builtins.py:779
+#: breezy/builtins.py:778
 #, python-brace-format
 msgid "ignored {0} matching \"{1}\"\n"
 msgstr ""
 
-#: breezy/builtins.py:784
+#: breezy/builtins.py:783
 msgid "Create a new versioned directory."
 msgstr ""
 
-#: breezy/builtins.py:786
+#: breezy/builtins.py:785
 msgid "This is equivalent to creating the directory and then adding it."
 msgstr ""
 
 # help of 'parents' option of 'mkdir' command
-#: breezy/builtins.py:793
+#: breezy/builtins.py:792
 msgid "No error if existing, make parent directories as needed."
 msgstr ""
 
-#: breezy/builtins.py:827
+#: breezy/builtins.py:826
 #, python-format
 msgid "added %s\n"
 msgstr ""
 
-#: breezy/builtins.py:874
+#: breezy/builtins.py:873
 #, python-format
 msgid "invalid kind %r specified"
 msgstr ""
 
-#: breezy/builtins.py:912
+#: breezy/builtins.py:911
 msgid "Copy a file."
 msgstr ""
 
-#: breezy/builtins.py:914
+#: breezy/builtins.py:913
 msgid "    brz cp SOURCE... DESTINATION"
 msgstr ""
 
-#: breezy/builtins.py:916
+#: breezy/builtins.py:915
 msgid ""
 "If the last argument is a versioned directory, all the other names\n"
 "are copied into it.  Otherwise, there must be exactly two arguments\n"
 "and the file is copied to a new name."
 msgstr ""
 
-#: breezy/builtins.py:920
+#: breezy/builtins.py:919
 msgid ""
 "Files cannot be copied between branches. Only files can be copied\n"
 "at the moment."
 msgstr ""
 
-#: breezy/builtins.py:936 breezy/builtins.py:1029
+#: breezy/builtins.py:934 breezy/builtins.py:1027
 msgid "missing file argument"
 msgstr ""
 
-#: breezy/builtins.py:942
+#: breezy/builtins.py:940
 msgid "can not copy root of branch"
 msgstr ""
 
-#: breezy/builtins.py:950
+#: breezy/builtins.py:948
 msgid "to copy multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: breezy/builtins.py:964 breezy/builtins.py:980
+#: breezy/builtins.py:962 breezy/builtins.py:978
 #, python-format
 msgid "Could not copy %s => %s: %s is not versioned."
 msgstr ""
 
-#: breezy/builtins.py:968
+#: breezy/builtins.py:966
 #, python-format
 msgid "Could not copy %s => %s . %s is not versioned\\."
 msgstr ""
 
-#: breezy/builtins.py:972
+#: breezy/builtins.py:970
 #, python-format
 msgid "Could not copy %s => %s . %s is a directory."
 msgstr ""
 
-#: breezy/builtins.py:984
+#: breezy/builtins.py:982
 #, python-format
 msgid "Could not copy to %s: %s is not a directory."
 msgstr ""
 
+#: breezy/builtins.py:989
+msgid "Move or rename a file."
+msgstr ""
+
 #: breezy/builtins.py:991
-msgid "Move or rename a file."
+msgid "    brz mv SOURCE... DESTINATION"
 msgstr ""
 
 #: breezy/builtins.py:993
-msgid "    brz mv SOURCE... DESTINATION"
-msgstr ""
-
-#: breezy/builtins.py:995
 msgid ""
 "If the last argument is a versioned directory, all the other names\n"
 "are moved into it.  Otherwise, there must be exactly two arguments\n"
 "and the file is changed to a new name."
 msgstr ""
 
-#: breezy/builtins.py:999
+#: breezy/builtins.py:997
 msgid ""
 "If OLDNAME does not exist on the filesystem but is versioned and\n"
 "NEWNAME does exist on the filesystem but is not versioned, mv\n"
@@ -563,52 +563,52 @@
 "The same is valid when moving many SOURCE files to a DESTINATION."
 msgstr ""
 
-#: breezy/builtins.py:1005
+#: breezy/builtins.py:1003
 msgid "Files cannot be moved between branches."
 msgstr ""
 
 # help of 'after' option of 'mv' command
-#: breezy/builtins.py:1012
+#: breezy/builtins.py:1010
 msgid ""
 "Move only the brz identifier of the file, because the file has already been "
 "moved."
 msgstr ""
 
 # help of 'auto' option of 'mv' command
-#: breezy/builtins.py:1014
+#: breezy/builtins.py:1012
 msgid "Automatically guess renames."
 msgstr ""
 
 # help of 'dry-run' option of 'mv' command
-#: breezy/builtins.py:1016
+#: breezy/builtins.py:1014
 msgid "Avoid making changes when guessing renames."
 msgstr ""
 
-#: breezy/builtins.py:1025
+#: breezy/builtins.py:1023
 msgid "--dry-run requires --auto."
 msgstr ""
 
-#: breezy/builtins.py:1035
+#: breezy/builtins.py:1033
 msgid "can not move root of branch"
 msgstr ""
 
-#: breezy/builtins.py:1042
+#: breezy/builtins.py:1040
 msgid "Only one path may be specified to --auto."
 msgstr ""
 
-#: breezy/builtins.py:1045
+#: breezy/builtins.py:1043
 msgid "--after cannot be specified with --auto."
 msgstr ""
 
-#: breezy/builtins.py:1081
+#: breezy/builtins.py:1079
 msgid "to mv multiple files the destination must be a versioned directory"
 msgstr ""
 
+#: breezy/builtins.py:1132
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
 #: breezy/builtins.py:1134
-msgid "Turn this branch into a mirror of another branch."
-msgstr ""
-
-#: breezy/builtins.py:1136
 msgid ""
 "By default, this command only works on branches that have not diverged.\n"
 "Branches are considered diverged if the destination branch's most recent\n"
@@ -616,21 +616,21 @@
 "parent."
 msgstr ""
 
-#: breezy/builtins.py:1141
+#: breezy/builtins.py:1139
 msgid ""
 "If branches have diverged, you can use 'brz merge' to integrate the changes\n"
 "from one into the other.  Once one branch has merged, the other should\n"
 "be able to pull it again."
 msgstr ""
 
-#: breezy/builtins.py:1145
+#: breezy/builtins.py:1143
 msgid ""
 "If you want to replace your local changes and just want your branch to\n"
 "match the remote one, use pull --overwrite. This will work even if the two\n"
 "branches have diverged."
 msgstr ""
 
-#: breezy/builtins.py:1149
+#: breezy/builtins.py:1147
 msgid ""
 "If there is no default location set, the first pull will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the\n"
@@ -638,14 +638,14 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1154
+#: breezy/builtins.py:1152
 msgid ""
 "The --verbose option will display the revisions pulled using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
 "-Olog_format=<other_format>."
 msgstr ""
 
-#: breezy/builtins.py:1158
+#: breezy/builtins.py:1156
 msgid ""
 "Note: The location can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
@@ -653,77 +653,77 @@
 msgstr ""
 
 # help of 'verbose' option of 'pull' command
-#: breezy/builtins.py:1166
+#: breezy/builtins.py:1164
 msgid "Show logs of pulled revisions."
 msgstr ""
 
 # help of 'directory' option of 'pull' command
-#: breezy/builtins.py:1168
+#: breezy/builtins.py:1166
 msgid ""
 "Branch to pull into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'local' option of 'pull' command
-#: breezy/builtins.py:1171
+#: breezy/builtins.py:1169
 msgid ""
 "Perform a local pull in a bound branch.  Local pulls are not applied to the "
 "master branch."
 msgstr ""
 
-#: breezy/builtins.py:1208
+#: breezy/builtins.py:1206
 msgid "No working tree, ignoring --show-base"
 msgstr ""
 
-#: breezy/builtins.py:1224 breezy/plugins/rewrite/commands.py:477
+#: breezy/builtins.py:1222 breezy/plugins/rewrite/commands.py:479
 msgid "No pull location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1231
+#: breezy/builtins.py:1229
 #, python-format
 msgid "Using saved parent location: %s\n"
 msgstr ""
 
-#: breezy/builtins.py:1238 breezy/builtins.py:4519
+#: breezy/builtins.py:1236 breezy/builtins.py:4518
 msgid "Cannot use -r with merge directives or bundles"
 msgstr ""
 
+#: breezy/builtins.py:1279
+msgid "Update a mirror of this branch."
+msgstr ""
+
 #: breezy/builtins.py:1281
-msgid "Update a mirror of this branch."
-msgstr ""
-
-#: breezy/builtins.py:1283
 msgid ""
 "The target branch will not have its working tree populated because this\n"
 "is both expensive, and is not supported on remote file systems."
 msgstr ""
 
-#: breezy/builtins.py:1286
+#: breezy/builtins.py:1284
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: breezy/builtins.py:1289
+#: breezy/builtins.py:1287
 msgid ""
 "This command only works on branches that have not diverged.  Branches are\n"
 "considered diverged if the destination branch's most recent commit is one\n"
 "that has not been merged (directly or indirectly) by the source branch."
 msgstr ""
 
-#: breezy/builtins.py:1293
+#: breezy/builtins.py:1291
 msgid ""
 "If branches have diverged, you can use 'brz push --overwrite' to replace\n"
 "the other branch completely, discarding its unmerged changes."
 msgstr ""
 
-#: breezy/builtins.py:1296
+#: breezy/builtins.py:1294
 msgid ""
 "If you want to ensure you have the different changes in the other branch,\n"
 "do a merge (see brz help merge) from the other branch, and commit that.\n"
 "After that you will be able to do a push without '--overwrite'."
 msgstr ""
 
-#: breezy/builtins.py:1300
+#: breezy/builtins.py:1298
 msgid ""
 "If there is no default push location set, the first push will set it (use\n"
 "--no-remember to avoid setting it).  After that, you can omit the\n"
@@ -731,7 +731,7 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1305
+#: breezy/builtins.py:1303
 msgid ""
 "The --verbose option will display the revisions pushed using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
@@ -739,27 +739,27 @@
 msgstr ""
 
 # help of 'directory' option of 'push' command
-#: breezy/builtins.py:1316
+#: breezy/builtins.py:1314
 msgid ""
 "Branch to push from, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'push' command
-#: breezy/builtins.py:1319
+#: breezy/builtins.py:1317
 msgid ""
 "By default push will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow push to proceed."
 msgstr ""
 
 # help of 'stacked' option of 'push' command
-#: breezy/builtins.py:1324
+#: breezy/builtins.py:1322
 msgid ""
 "Create a stacked branch that references the public location of the parent "
 "branch."
 msgstr ""
 
 # help of 'stacked-on' option of 'push' command
-#: breezy/builtins.py:1327
+#: breezy/builtins.py:1325
 msgid ""
 "Create a stacked branch that refers to another branch for the commit "
 "history. Only the work not present in the referenced branch is included in "
@@ -767,55 +767,55 @@
 msgstr ""
 
 # help of 'strict' option of 'push' command
-#: breezy/builtins.py:1332
+#: breezy/builtins.py:1330
 msgid ""
 "Refuse to push if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
 # help of 'no-tree' option of 'push' command
-#: breezy/builtins.py:1335
+#: breezy/builtins.py:1333
 msgid "Don't populate the working tree, even for protocols that support it."
 msgstr ""
 
 # help of 'overwrite-tags' option of 'pull' command
 # help of 'overwrite-tags' option of 'push' command
-#: breezy/builtins.py:1338
+#: breezy/builtins.py:1336
 msgid "Overwrite tags only."
 msgstr ""
 
 # help of 'lossy' option of 'push' command
-#: breezy/builtins.py:1339
+#: breezy/builtins.py:1337
 msgid ""
 "Allow lossy push, i.e. dropping metadata that can't be represented in the "
 "target."
 msgstr ""
 
-#: breezy/builtins.py:1393
+#: breezy/builtins.py:1391
 msgid "Could not determine branch to refer to."
 msgstr ""
 
-#: breezy/builtins.py:1402
+#: breezy/builtins.py:1400
 #, python-format
 msgid ""
 "No push location known or specified. To push to the parent branch (at %s), "
 "use 'brz push :parent'."
 msgstr ""
 
-#: breezy/builtins.py:1408
+#: breezy/builtins.py:1406
 msgid "No push location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1412
+#: breezy/builtins.py:1410
 #, python-format
 msgid "Using saved push location: %s"
 msgstr ""
 
+#: breezy/builtins.py:1421
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
 #: breezy/builtins.py:1423
-msgid "Create a new branch that is a copy of an existing branch."
-msgstr ""
-
-#: breezy/builtins.py:1425
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
 "be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
@@ -826,118 +826,118 @@
 "create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1432
+#: breezy/builtins.py:1430
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"branch foo/bar -r 5\"."
 msgstr ""
 
 # help of 'no-tree' option of 'branch' command
-#: breezy/builtins.py:1445
+#: breezy/builtins.py:1443
 msgid "Create a branch without a working-tree."
 msgstr ""
 
 # help of 'switch' option of 'branch' command
-#: breezy/builtins.py:1447
+#: breezy/builtins.py:1445
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
 # help of 'stacked' option of 'branch' command
-#: breezy/builtins.py:1450
+#: breezy/builtins.py:1448
 msgid ""
 "Create a stacked branch referring to the source branch. The new branch will "
 "depend on the availability of the source branch for all operations."
 msgstr ""
 
 # help of 'standalone' option of 'branch' command
-#: breezy/builtins.py:1454
+#: breezy/builtins.py:1452
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'branch' command
-#: breezy/builtins.py:1456
+#: breezy/builtins.py:1454
 msgid ""
 "By default branch will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow branch to proceed."
 msgstr ""
 
 # help of 'bind' option of 'branch' command
-#: breezy/builtins.py:1461
+#: breezy/builtins.py:1459
 msgid "Bind new branch to from location."
 msgstr ""
 
 # help of 'colocated-branch' option of 'branch' command
-#: breezy/builtins.py:1465
+#: breezy/builtins.py:1463
 msgid "Name of colocated branch to sprout."
 msgstr ""
 
-#: breezy/builtins.py:1506
+#: breezy/builtins.py:1505
 #, python-format
 msgid "Target directory \"%s\" already exists."
 msgstr ""
 
-#: breezy/builtins.py:1518
+#: breezy/builtins.py:1517
 #, python-format
 msgid "Parent of \"%s\" does not exist."
 msgstr ""
 
-#: breezy/builtins.py:1537
+#: breezy/builtins.py:1536
 #, python-brace-format
 msgid "The branch {0} has no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:1554 breezy/push.py:52
+#: breezy/builtins.py:1553 breezy/push.py:52
 #, python-format
 msgid "Created new stacked branch referring to %s."
 msgstr ""
 
-#: breezy/builtins.py:1560
+#: breezy/builtins.py:1559
 #, python-format
 msgid "Branched %d revision."
 msgid_plural "Branched %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:1564 breezy/push.py:55
+#: breezy/builtins.py:1563 breezy/push.py:55
 msgid "Created new branch."
 msgstr ""
 
-#: breezy/builtins.py:1569
+#: breezy/builtins.py:1568
 #, python-format
 msgid "New branch bound to %s"
 msgstr ""
 
-#: breezy/builtins.py:1574
+#: breezy/builtins.py:1573
 #, python-format
 msgid "Switched to branch: %s"
 msgstr ""
 
-#: breezy/builtins.py:1579
+#: breezy/builtins.py:1578
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: breezy/builtins.py:1581
+#: breezy/builtins.py:1580
 msgid ""
 "This command will print the names of all the branches at the current\n"
 "location."
 msgstr ""
 
 # help of 'recursive' option of 'branches' command
-#: breezy/builtins.py:1588
+#: breezy/builtins.py:1587
 msgid ""
 "Recursively scan for branches rather than just looking in the specified "
 "location."
 msgstr ""
 
-#: breezy/builtins.py:1617
+#: breezy/builtins.py:1616
 msgid "(default)"
 msgstr ""
 
-#: breezy/builtins.py:1628
+#: breezy/builtins.py:1627
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: breezy/builtins.py:1630
+#: breezy/builtins.py:1629
 msgid ""
 "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
 "for the branch found in '.'. This is useful if you have removed the working\n"
@@ -945,7 +945,7 @@
 "current location using SFTP."
 msgstr ""
 
-#: breezy/builtins.py:1635
+#: breezy/builtins.py:1634
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
 "will be used.  In other words, \"checkout ../foo/bar\" will attempt to "
@@ -957,7 +957,7 @@
 "attempt to create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1642
+#: breezy/builtins.py:1641
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
@@ -966,7 +966,7 @@
 msgstr ""
 
 # help of 'lightweight' option of 'checkout' command
-#: breezy/builtins.py:1652
+#: breezy/builtins.py:1651
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -976,17 +976,17 @@
 
 # help of 'files-from' option of 'branch' command
 # help of 'files-from' option of 'checkout' command
-#: breezy/builtins.py:1659
+#: breezy/builtins.py:1658
 msgid "Get file contents from this tree."
 msgstr ""
 
 # help of 'hardlink' option of 'branch' command
 # help of 'hardlink' option of 'checkout' command
-#: breezy/builtins.py:1661
+#: breezy/builtins.py:1660
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: breezy/builtins.py:1701
+#: breezy/builtins.py:1700
 msgid ""
 "Clone a control directory.\n"
 "    "
@@ -994,38 +994,38 @@
 
 # help of 'no-recurse-nested' option of 'branch' command
 # help of 'no-recurse-nested' option of 'clone' command
-#: breezy/builtins.py:1707
+#: breezy/builtins.py:1706
 msgid "Do not recursively check out nested trees."
 msgstr ""
 
-#: breezy/builtins.py:1729
+#: breezy/builtins.py:1728
 msgid "Created new control directory."
 msgstr ""
 
-#: breezy/builtins.py:1733
+#: breezy/builtins.py:1732
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: breezy/builtins.py:1761
+#: breezy/builtins.py:1760
 msgid "Update a working tree to a new revision."
 msgstr ""
 
-#: breezy/builtins.py:1763
+#: breezy/builtins.py:1762
 msgid ""
 "This will perform a merge of the destination revision (the tip of the\n"
 "branch, or the specified revision) into the working tree, and then make\n"
 "that revision the basis revision for the working tree."
 msgstr ""
 
-#: breezy/builtins.py:1767
+#: breezy/builtins.py:1766
 msgid ""
 "You can use this to visit an older revision, or to update a working tree\n"
 "that is out of date from its branch."
 msgstr ""
 
-#: breezy/builtins.py:1770
+#: breezy/builtins.py:1769
 msgid ""
 "If there are any uncommitted changes in the tree, they will be carried\n"
 "across and remain as uncommitted changes after the update.  To discard\n"
@@ -1033,13 +1033,13 @@
 "with the changes brought in by the change in basis revision."
 msgstr ""
 
-#: breezy/builtins.py:1775
+#: breezy/builtins.py:1774
 msgid ""
 "If the tree's branch is bound to a master branch, brz will also update\n"
 "the branch from the master."
 msgstr ""
 
-#: breezy/builtins.py:1778
+#: breezy/builtins.py:1777
 msgid ""
 "You cannot update just a single file or directory, because each Breezy\n"
 "working tree has just a single basis revision.  If you want to restore a\n"
@@ -1049,103 +1049,103 @@
 "out the old content of that file to a new location."
 msgstr ""
 
-#: breezy/builtins.py:1785
+#: breezy/builtins.py:1784
 msgid ""
 "The 'dir' argument, if given, must be the location of the root of a\n"
 "working tree to update.  By default, the working tree that contains the\n"
 "current working directory is used."
 msgstr ""
 
-#: breezy/builtins.py:1801
+#: breezy/builtins.py:1800
 msgid "brz update --revision takes exactly one revision"
 msgstr ""
 
-#: breezy/builtins.py:1809
+#: breezy/builtins.py:1808
 msgid "brz update can only update a whole tree, not a file or subdirectory"
 msgstr ""
 
-#: breezy/builtins.py:1839
+#: breezy/builtins.py:1838
 #, python-brace-format
 msgid "Tree is up to date at revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1855
+#: breezy/builtins.py:1854
 #, python-format
 msgid ""
 "branch has no revision %s\n"
 "brz update --revision only works for a revision in the branch history"
 msgstr ""
 
-#: breezy/builtins.py:1861
+#: breezy/builtins.py:1859
 #, python-brace-format
 msgid "Updated to revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1865
+#: breezy/builtins.py:1863
 msgid ""
 "Your local commits will now show as pending merges with 'brz status', and "
 "can be committed with 'brz commit'."
 msgstr ""
 
+#: breezy/builtins.py:1872
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
 #: breezy/builtins.py:1874
-msgid "Show information about a working tree, branch or repository."
-msgstr ""
-
-#: breezy/builtins.py:1876
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: breezy/builtins.py:1879
+#: breezy/builtins.py:1877
 msgid ""
 "In verbose mode, statistical information is included with each report.\n"
 "To see extended statistic information, use a verbosity level of 2 or\n"
 "higher by specifying the verbose option multiple times, e.g. -vv."
 msgstr ""
 
-#: breezy/builtins.py:1883
+#: breezy/builtins.py:1881
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: breezy/builtins.py:1885 breezy/builtins.py:3820 breezy/builtins.py:4987
-#: breezy/builtins.py:6581 breezy/plugins/fastimport/cmds.py:206
-#: breezy/plugins/fastimport/cmds.py:412 breezy/plugins/gitlab/cmds.py:39
+#: breezy/builtins.py:1883 breezy/builtins.py:3821 breezy/builtins.py:4985
+#: breezy/builtins.py:6575 breezy/plugins/fastimport/cmds.py:209
+#: breezy/plugins/fastimport/cmds.py:415 breezy/plugins/gitlab/cmds.py:37
 msgid ":Examples:"
 msgstr ""
 
+#: breezy/builtins.py:1885
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
 #: breezy/builtins.py:1887
-msgid "  Display information on the format and related locations:"
+msgid "    brz info"
 msgstr ""
 
 #: breezy/builtins.py:1889
-msgid "    brz info"
-msgstr ""
-
-#: breezy/builtins.py:1891
 msgid ""
 "  Display the above together with extended format information and\n"
 "  basic statistics (like the number of files in the working tree and\n"
 "  number of revisions in the branch and repository):"
 msgstr ""
 
+#: breezy/builtins.py:1893
+msgid "    brz info -v"
+msgstr ""
+
 #: breezy/builtins.py:1895
-msgid "    brz info -v"
+msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
 #: breezy/builtins.py:1897
-msgid "  Display the above together with number of committers to the branch:"
-msgstr ""
-
-#: breezy/builtins.py:1899
 msgid "    brz info -vv"
 msgstr ""
 
+#: breezy/builtins.py:1916
+msgid "Remove files or directories."
+msgstr ""
+
 #: breezy/builtins.py:1918
-msgid "Remove files or directories."
-msgstr ""
-
-#: breezy/builtins.py:1920
 msgid ""
 "This makes Breezy stop tracking changes to the specified files. Breezy will\n"
 "delete them if they can easily be recovered using revert otherwise they\n"
@@ -1155,44 +1155,44 @@
 msgstr ""
 
 # help of 'new' option of 'remove' command
-#: breezy/builtins.py:1929
+#: breezy/builtins.py:1927
 msgid "Only remove files that have never been committed."
 msgstr ""
 
 # help of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1931
+#: breezy/builtins.py:1929
 msgid "The file deletion mode to be used."
 msgstr ""
 
 # title of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1932
+#: breezy/builtins.py:1930
 msgid "Deletion Strategy"
 msgstr ""
 
 # help of 'file-deletion-strategy=safe' option of 'remove' command
-#: breezy/builtins.py:1933
+#: breezy/builtins.py:1931
 msgid "Backup changed files (default)."
 msgstr ""
 
 # help of 'file-deletion-strategy=keep' option of 'remove' command
-#: breezy/builtins.py:1934
+#: breezy/builtins.py:1932
 msgid "Delete from brz but leave the working copy."
 msgstr ""
 
 # help of 'file-deletion-strategy=no-backup' option of 'remove' command
-#: breezy/builtins.py:1935
+#: breezy/builtins.py:1933
 msgid "Don't backup changed files."
 msgstr ""
 
-#: breezy/builtins.py:1956
+#: breezy/builtins.py:1954
 msgid "No matching files."
 msgstr ""
 
+#: breezy/builtins.py:1971
+msgid "Reconcile brz metadata in a branch."
+msgstr ""
+
 #: breezy/builtins.py:1973
-msgid "Reconcile brz metadata in a branch."
-msgstr ""
-
-#: breezy/builtins.py:1975
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or brz upgrades. You should only\n"
@@ -1200,7 +1200,7 @@
 "advises you to run it."
 msgstr ""
 
-#: breezy/builtins.py:1980
+#: breezy/builtins.py:1978
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -1208,20 +1208,20 @@
 "correctly in both branches."
 msgstr ""
 
-#: breezy/builtins.py:1985
+#: breezy/builtins.py:1983
 msgid ""
 "At the same time it is run it may recompress data resulting in\n"
 "a potential saving in disk space or performance gain."
 msgstr ""
 
-#: breezy/builtins.py:1988
+#: breezy/builtins.py:1986
 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
 msgstr ""
 
 # help of 'format=git-bare' option of 'init' command
 # help of 'format=git-bare' option of 'init-shared-repository' command
 # help of 'format=git-bare' option of 'upgrade' command
-#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
+#: breezy/builtins.py:2053 breezy/builtins.py:2174 breezy/builtins.py:3856
 msgid "Bare GIT repository (no working tree)."
 msgstr ""
 
@@ -1234,28 +1234,28 @@
 # help of 'format=2a' option of 'upgrade' command
 # help of 'format=bzr' option of 'upgrade' command
 # help of 'format=default' option of 'upgrade' command
-#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
+#: breezy/builtins.py:2053 breezy/builtins.py:2174 breezy/builtins.py:3856
 msgid "Format for the bzr 2.0 series.\n"
 msgstr ""
 
 # help of 'format=git' option of 'init' command
 # help of 'format=git' option of 'init-shared-repository' command
 # help of 'format=git' option of 'upgrade' command
-#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
+#: breezy/builtins.py:2053 breezy/builtins.py:2174 breezy/builtins.py:3856
 msgid "GIT repository."
 msgstr ""
 
+#: breezy/builtins.py:2054
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
 #: breezy/builtins.py:2056
-msgid "Make a directory into a versioned branch."
-msgstr ""
-
-#: breezy/builtins.py:2058
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: breezy/builtins.py:2061
+#: breezy/builtins.py:2059
 msgid ""
 "If there is a repository in a parent directory of the location, then\n"
 "the history of the branch will be stored in the repository.  Otherwise\n"
@@ -1263,17 +1263,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: breezy/builtins.py:2066
+#: breezy/builtins.py:2064
 msgid ""
 "If there is already a branch at the location but it has no working tree,\n"
 "the tree can be populated with 'brz checkout'."
 msgstr ""
 
+#: breezy/builtins.py:2067
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
 #: breezy/builtins.py:2069
-msgid "Recipe for importing a tree of files::"
-msgstr ""
-
-#: breezy/builtins.py:2071
 msgid ""
 "    cd ~/project\n"
 "    brz init\n"
@@ -1284,52 +1284,52 @@
 
 # help of 'create-prefix' option of 'init' command
 # help of 'create-prefix' option of 'push' command
-#: breezy/builtins.py:2082
+#: breezy/builtins.py:2080
 msgid "Create the path leading up to the branch if it does not already exist."
 msgstr ""
 
 # help of 'format' option of 'init' command
-#: breezy/builtins.py:2085
+#: breezy/builtins.py:2083
 msgid "Specify a format for this branch. See \"help formats\" for a full list."
 msgstr ""
 
 # help of 'append-revisions-only' option of 'init' command
-#: breezy/builtins.py:2094
+#: breezy/builtins.py:2092
 msgid "Never change revnos or the existing log.  Append revisions to it only."
 msgstr ""
 
 # help of 'no-tree' option of 'init' command
-#: breezy/builtins.py:2097
+#: breezy/builtins.py:2095
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: breezy/builtins.py:2118 breezy/push.py:110
+#: breezy/builtins.py:2116 breezy/push.py:110
 #, python-format
 msgid ""
 "Parent directory of %s does not exist.\n"
 "You may supply --create-prefix to create all leading parent directories."
 msgstr ""
 
-#: breezy/builtins.py:2153
+#: breezy/builtins.py:2151
 msgid ""
 "This branch format cannot be set to append-revisions-only.  Try --default."
 msgstr ""
 
-#: breezy/builtins.py:2164
+#: breezy/builtins.py:2162
 #, python-brace-format
 msgid "Created a {0} (format: {1})\n"
 msgstr ""
 
-#: breezy/builtins.py:2173
+#: breezy/builtins.py:2171
 #, python-format
 msgid "Using shared repository: %s\n"
 msgstr ""
 
+#: breezy/builtins.py:2175
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
 #: breezy/builtins.py:2177
-msgid "Create a shared repository for branches to share storage space."
-msgstr ""
-
-#: breezy/builtins.py:2179
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -1337,7 +1337,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: breezy/builtins.py:2184
+#: breezy/builtins.py:2182
 msgid ""
 "If the --no-trees option is given then the branches in the repository\n"
 "will not have working trees by default.  They will still exist as\n"
@@ -1347,23 +1347,23 @@
 "branches, such as on a server."
 msgstr ""
 
-#: breezy/builtins.py:2191
+#: breezy/builtins.py:2189
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: breezy/builtins.py:2194
+#: breezy/builtins.py:2192
 msgid ""
 "        brz init-shared-repo --no-trees repo\n"
 "        brz init repo/trunk"
 msgstr ""
 
+#: breezy/builtins.py:2195
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
 #: breezy/builtins.py:2197
-msgid "    Make a lightweight checkout elsewhere::"
-msgstr ""
-
-#: breezy/builtins.py:2199
 msgid ""
 "        brz checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
@@ -1371,35 +1371,35 @@
 msgstr ""
 
 # help of 'format' option of 'init-shared-repository' command
-#: breezy/builtins.py:2207
+#: breezy/builtins.py:2205
 msgid ""
 "Specify a format for this repository. See \"brz help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init-shared-repository' command
 # title of 'format' option of 'fast-import' command
-#: breezy/builtins.py:2213 breezy/plugins/fastimport/cmds.py:282
+#: breezy/builtins.py:2211 breezy/plugins/fastimport/cmds.py:285
 msgid "Repository format"
 msgstr ""
 
 # help of 'no-trees' option of 'init-shared-repository' command
-#: breezy/builtins.py:2215
+#: breezy/builtins.py:2213
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
 # help of 'color' option of 'diff' command
-#: breezy/builtins.py:2245
+#: breezy/builtins.py:2243
 msgid ""
 "Color mode to use.  \"always\": Always colorize output (default).  \"auto\": "
-"Only colorize output if terminal supports it and STDOUT is a TTY.  \"never"
-"\": Never colorize output."
+"Only colorize output if terminal supports it and STDOUT is a TTY.  "
+"\"never\": Never colorize output."
+msgstr ""
+
+#: breezy/builtins.py:2244
+msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
 #: breezy/builtins.py:2246
-msgid "Show differences in the working tree, between revisions or branches."
-msgstr ""
-
-#: breezy/builtins.py:2248
 msgid ""
 "If no arguments are given, all changes for the current tree are listed.\n"
 "If files are given, only the changes in those files are listed.\n"
@@ -1409,13 +1409,13 @@
 "given."
 msgstr ""
 
-#: breezy/builtins.py:2255
+#: breezy/builtins.py:2253
 msgid ""
 "\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: breezy/builtins.py:2258
+#: breezy/builtins.py:2256
 msgid ""
 "Note that when using the -r argument with a range of revisions, the\n"
 "differences are computed between the two specified revisions.  That\n"
@@ -1425,7 +1425,7 @@
 "in the range."
 msgstr ""
 
-#: breezy/builtins.py:2265
+#: breezy/builtins.py:2263
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -1434,219 +1434,219 @@
 "    0 - no change"
 msgstr ""
 
-#: breezy/builtins.py:2271
+#: breezy/builtins.py:2269
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
+#: breezy/builtins.py:2272
+msgid "        brz diff"
+msgstr ""
+
 #: breezy/builtins.py:2274
-msgid "        brz diff"
+msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
 #: breezy/builtins.py:2276
-msgid "    Difference between the working tree and revision 1::"
+msgid "        brz diff -r1"
 msgstr ""
 
 #: breezy/builtins.py:2278
-msgid "        brz diff -r1"
+msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
 #: breezy/builtins.py:2280
-msgid "    Difference between revision 3 and revision 1::"
+msgid "        brz diff -r1..3"
 msgstr ""
 
 #: breezy/builtins.py:2282
-msgid "        brz diff -r1..3"
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
 #: breezy/builtins.py:2284
-msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgid "        brz diff -r1..3 xxx"
 msgstr ""
 
 #: breezy/builtins.py:2286
-msgid "        brz diff -r1..3 xxx"
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
 #: breezy/builtins.py:2288
-msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgid "        brz diff -c2"
 msgstr ""
 
 #: breezy/builtins.py:2290
-msgid "        brz diff -c2"
+msgid "    To see the changes introduced by revision X::"
 msgstr ""
 
 #: breezy/builtins.py:2292
-msgid "    To see the changes introduced by revision X::"
+msgid "        brz diff -cX"
 msgstr ""
 
 #: breezy/builtins.py:2294
-msgid "        brz diff -cX"
-msgstr ""
-
-#: breezy/builtins.py:2296
 msgid ""
 "    Note that in the case of a merge, the -c option shows the changes\n"
 "    compared to the left hand parent. To see the changes against\n"
 "    another parent, use::"
 msgstr ""
 
+#: breezy/builtins.py:2298
+msgid "        brz diff -r<chosen_parent>..X"
+msgstr ""
+
 #: breezy/builtins.py:2300
-msgid "        brz diff -r<chosen_parent>..X"
-msgstr ""
-
-#: breezy/builtins.py:2302
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
+#: breezy/builtins.py:2303
+msgid "        brz diff -r-2.."
+msgstr ""
+
 #: breezy/builtins.py:2305
-msgid "        brz diff -r-2.."
+msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
 #: breezy/builtins.py:2307
-msgid "    Show just the differences for file NEWS::"
+msgid "        brz diff NEWS"
 msgstr ""
 
 #: breezy/builtins.py:2309
-msgid "        brz diff NEWS"
+msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
 #: breezy/builtins.py:2311
-msgid "    Show the differences in working tree xxx for file NEWS::"
+msgid "        brz diff xxx/NEWS"
 msgstr ""
 
 #: breezy/builtins.py:2313
-msgid "        brz diff xxx/NEWS"
+msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
 #: breezy/builtins.py:2315
-msgid "    Show the differences from branch xxx to this working tree:"
+msgid "        brz diff --old xxx"
 msgstr ""
 
 #: breezy/builtins.py:2317
-msgid "        brz diff --old xxx"
+msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
 #: breezy/builtins.py:2319
-msgid "    Show the differences between two branches for file NEWS::"
+msgid "        brz diff --old xxx --new yyy NEWS"
 msgstr ""
 
 #: breezy/builtins.py:2321
-msgid "        brz diff --old xxx --new yyy NEWS"
+msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
 msgstr ""
 
 #: breezy/builtins.py:2323
-msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
+msgid "        brz diff --prefix old/:new/"
 msgstr ""
 
 #: breezy/builtins.py:2325
-msgid "        brz diff --prefix old/:new/"
+msgid "    Show the differences using a custom diff program with options::"
 msgstr ""
 
 #: breezy/builtins.py:2327
-msgid "    Show the differences using a custom diff program with options::"
-msgstr ""
-
-#: breezy/builtins.py:2329
 msgid "        brz diff --using /usr/bin/diff --diff-options -wu"
 msgstr ""
 
 # help of 'diff-options' option of 'diff' command
-#: breezy/builtins.py:2335
+#: breezy/builtins.py:2333
 msgid "Pass these options to the external diff program."
 msgstr ""
 
 # help of 'prefix' option of 'diff' command
-#: breezy/builtins.py:2338
+#: breezy/builtins.py:2336
 msgid ""
 "Set prefixes added to old and new filenames, as two values separated by a "
 "colon. (eg \"old/:new/\")."
 msgstr ""
 
 # help of 'old' option of 'diff' command
-#: breezy/builtins.py:2341
+#: breezy/builtins.py:2339
 msgid "Branch/tree to compare from."
 msgstr ""
 
 # help of 'new' option of 'diff' command
-#: breezy/builtins.py:2345
+#: breezy/builtins.py:2343
 msgid "Branch/tree to compare to."
 msgstr ""
 
 # help of 'using' option of 'diff' command
-#: breezy/builtins.py:2351
+#: breezy/builtins.py:2349
 msgid "Use this command to compare files."
 msgstr ""
 
 # help of 'format' option of 'diff' command
-#: breezy/builtins.py:2356
+#: breezy/builtins.py:2354
 msgid "Diff format to use."
 msgstr ""
 
 # title of 'format' option of 'diff' command
-#: breezy/builtins.py:2358
+#: breezy/builtins.py:2356
 msgid "Diff format"
 msgstr ""
 
 # help of 'context' option of 'diff' command
-#: breezy/builtins.py:2360
+#: breezy/builtins.py:2358
 msgid "How many lines of context to show."
 msgstr ""
 
 # title of 'color' option of 'diff' command
-#: breezy/builtins.py:2366
+#: breezy/builtins.py:2364
 msgid "Color Mode"
 msgstr ""
 
 # help of 'check-style' option of 'diff' command
-#: breezy/builtins.py:2373
+#: breezy/builtins.py:2371
 msgid "Warn if trailing whitespace or spurious changes have been  added."
 msgstr ""
 
-#: breezy/builtins.py:2398
+#: breezy/builtins.py:2396
 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
 msgstr ""
 
-#: breezy/builtins.py:2402
+#: breezy/builtins.py:2400
 msgid "brz diff --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:2407 breezy/builtins.py:2813 breezy/builtins.py:2821
+#: breezy/builtins.py:2405 breezy/builtins.py:2811 breezy/builtins.py:2819
 #, python-brace-format
 msgid "{0} and {1} are mutually exclusive"
 msgstr ""
 
-#: breezy/builtins.py:2437
+#: breezy/builtins.py:2435
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
+#: breezy/builtins.py:2510
+msgid "Show the tree root directory."
+msgstr ""
+
 #: breezy/builtins.py:2512
-msgid "Show the tree root directory."
-msgstr ""
-
-#: breezy/builtins.py:2514
 msgid ""
 "The root is the nearest enclosing directory with a control\n"
 "directory."
 msgstr ""
 
-#: breezy/builtins.py:2530
+#: breezy/builtins.py:2528
 msgid "The limit argument must be an integer."
 msgstr ""
 
-#: breezy/builtins.py:2538
+#: breezy/builtins.py:2536
 msgid "The levels argument must be an integer."
 msgstr ""
 
+#: breezy/builtins.py:2541
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
 #: breezy/builtins.py:2543
-msgid "Show historical log for a branch or subset of a branch."
-msgstr ""
-
-#: breezy/builtins.py:2545
 msgid ""
 "log is brz's default tool for exploring the history of a branch.\n"
 "The branch to use is taken from the first parameter. If no parameters\n"
@@ -1654,14 +1654,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: breezy/builtins.py:2550
+#: breezy/builtins.py:2548
 msgid ""
 "  brz log                       log the current branch\n"
 "  brz log foo.py                log a file in its branch\n"
 "  brz log http://server/branch  log a branch on a server"
 msgstr ""
 
-#: breezy/builtins.py:2554
+#: breezy/builtins.py:2552
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1671,11 +1671,11 @@
 "were merged."
 msgstr ""
 
+#: breezy/builtins.py:2559
+msgid ":Output control:"
+msgstr ""
+
 #: breezy/builtins.py:2561
-msgid ":Output control:"
-msgstr ""
-
-#: breezy/builtins.py:2563
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1683,13 +1683,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: breezy/builtins.py:2568
+#: breezy/builtins.py:2566
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: breezy/builtins.py:2571
+#: breezy/builtins.py:2569
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1698,25 +1698,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: breezy/builtins.py:2577
+#: breezy/builtins.py:2575
 msgid ""
 "  Note that the default number of levels to display is a function of the\n"
 "  log format. If the -n option is not used, the standard log formats show\n"
 "  just the top level (mainline)."
 msgstr ""
 
-#: breezy/builtins.py:2581
+#: breezy/builtins.py:2579
 msgid ""
 "  Status summaries are shown using status flags like A, M, etc. To see\n"
 "  the changes explained using words like ``added`` and ``modified``\n"
 "  instead, use the -vv option."
 msgstr ""
 
+#: breezy/builtins.py:2583
+msgid ":Ordering control:"
+msgstr ""
+
 #: breezy/builtins.py:2585
-msgid ":Ordering control:"
-msgstr ""
-
-#: breezy/builtins.py:2587
 msgid ""
 "  To display revisions from oldest to newest, use the --forward option.\n"
 "  In most cases, using this option will have little impact on the total\n"
@@ -1724,17 +1724,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
+#: breezy/builtins.py:2590
+msgid ":Revision filtering:"
+msgstr ""
+
 #: breezy/builtins.py:2592
-msgid ":Revision filtering:"
-msgstr ""
-
-#: breezy/builtins.py:2594
 msgid ""
 "  The -r option can be used to specify what revision or range of revisions\n"
 "  to filter against. The various forms are shown below::"
 msgstr ""
 
-#: breezy/builtins.py:2597
+#: breezy/builtins.py:2595
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1742,13 +1742,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: breezy/builtins.py:2602
+#: breezy/builtins.py:2600
 msgid ""
 "  See ``brz help revisionspec`` for details on how to specify X and Y.\n"
 "  Some common examples are given below::"
 msgstr ""
 
-#: breezy/builtins.py:2605
+#: breezy/builtins.py:2603
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1758,7 +1758,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: breezy/builtins.py:2612
+#: breezy/builtins.py:2610
 msgid ""
 "  When logging a range of revisions using -rX..Y, log starts at\n"
 "  revision Y and searches back in history through the primary\n"
@@ -1768,73 +1768,73 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
+#: breezy/builtins.py:2617
+msgid ":Path filtering:"
+msgstr ""
+
 #: breezy/builtins.py:2619
-msgid ":Path filtering:"
-msgstr ""
-
-#: breezy/builtins.py:2621
 msgid ""
 "  If parameters are given and the first one is not a branch, the log\n"
 "  will be filtered to show only those revisions that changed the\n"
 "  nominated files or directories."
 msgstr ""
 
-#: breezy/builtins.py:2625
+#: breezy/builtins.py:2623
 msgid ""
 "  Filenames are interpreted within their historical context. To log a\n"
 "  deleted file, specify a revision range so that the file existed at\n"
 "  the end or start of the range."
 msgstr ""
 
-#: breezy/builtins.py:2629
+#: breezy/builtins.py:2627
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: breezy/builtins.py:2632
+#: breezy/builtins.py:2630
 msgid ""
 "  * revision 1: add tutorial.txt\n"
 "  * revision 2: modify tutorial.txt\n"
 "  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
 msgstr ""
 
+#: breezy/builtins.py:2634
+msgid "  In this case:"
+msgstr ""
+
 #: breezy/builtins.py:2636
-msgid "  In this case:"
+msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
 #: breezy/builtins.py:2638
-msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
+msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
 #: breezy/builtins.py:2640
-msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
-msgstr ""
-
-#: breezy/builtins.py:2642
 msgid ""
 "  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: breezy/builtins.py:2645
+#: breezy/builtins.py:2643
 msgid ""
 "  * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
 "    was no file called guide.txt in revision 2."
 msgstr ""
 
-#: breezy/builtins.py:2648
+#: breezy/builtins.py:2646
 msgid ""
 "  Renames are always followed by log. By design, there is no need to\n"
 "  explicitly ask for this (and no way to stop logging a file back\n"
 "  until it was last renamed)."
 msgstr ""
 
+#: breezy/builtins.py:2650
+msgid ":Other filtering:"
+msgstr ""
+
 #: breezy/builtins.py:2652
-msgid ":Other filtering:"
-msgstr ""
-
-#: breezy/builtins.py:2654
 msgid ""
 "  The --match option can be used for finding revisions that match a\n"
 "  regular expression in a commit message, committer, author or bug.\n"
@@ -1843,24 +1843,24 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
+#: breezy/builtins.py:2658
+msgid ":Tips & tricks:"
+msgstr ""
+
 #: breezy/builtins.py:2660
-msgid ":Tips & tricks:"
-msgstr ""
-
-#: breezy/builtins.py:2662
 msgid ""
 "  GUI tools and IDEs are often better at exploring history than command\n"
-"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
-"  bzr-explorer shell, or the Loggerhead web interface.  See the Bazaar\n"
+"  line tools: you may prefer qlog from qbzr, or the Loggerhead web\n"
+"  interface.  See the Breezy\n"
 "  Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/> and\n"
-"  <http://wiki.bazaar.canonical.com/IDEIntegration>."
+"  <http://wiki.breezy-vcs.org/IDEIntegration>."
+msgstr ""
+
+#: breezy/builtins.py:2666
+msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
 msgstr ""
 
 #: breezy/builtins.py:2668
-msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
-msgstr ""
-
-#: breezy/builtins.py:2670
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1868,20 +1868,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: breezy/builtins.py:2675
+#: breezy/builtins.py:2673
 msgid ""
 "  ``brz tip`` will then show the latest revision while ``brz top``\n"
 "  will show the last 10 mainline revisions. To see the details of a\n"
 "  particular revision X,  ``brz show -rX``."
 msgstr ""
 
-#: breezy/builtins.py:2679
+#: breezy/builtins.py:2677
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``brz log -n0 -rX``."
 msgstr ""
 
-#: breezy/builtins.py:2682
+#: breezy/builtins.py:2680
 msgid ""
 "  ``brz log -v`` on a branch with lots of history is currently\n"
 "  very slow. A fix for this issue is currently under development.\n"
@@ -1889,7 +1889,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: breezy/builtins.py:2687
+#: breezy/builtins.py:2685
 msgid ""
 "  brz has a generic full-text matching plugin, brz-search, that can be\n"
 "  used to find revisions matching user names, commit messages, etc.\n"
@@ -1897,7 +1897,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: breezy/builtins.py:2692
+#: breezy/builtins.py:2690
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1906,169 +1906,169 @@
 msgstr ""
 
 # help of 'forward' option of 'log' command
-#: breezy/builtins.py:2701
+#: breezy/builtins.py:2699
 msgid "Show from oldest to newest."
 msgstr ""
 
 # help of 'verbose' option of 'log' command
-#: breezy/builtins.py:2704
+#: breezy/builtins.py:2702
 msgid "Show files changed in each revision."
 msgstr ""
 
 # help of 'change' option of 'log' command
-#: breezy/builtins.py:2710
+#: breezy/builtins.py:2708
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
 # help of 'authors' option of 'log' command
-#: breezy/builtins.py:2714
+#: breezy/builtins.py:2712
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
 # title of 'authors' option of 'log' command
-#: breezy/builtins.py:2715
+#: breezy/builtins.py:2713
 msgid "Authors"
 msgstr ""
 
 # help of 'levels' option of 'log' command
-#: breezy/builtins.py:2721
+#: breezy/builtins.py:2719
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
 # help of 'limit' option of 'log' command
-#: breezy/builtins.py:2731
+#: breezy/builtins.py:2729
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
 # help of 'show-diff' option of 'log' command
-#: breezy/builtins.py:2736
+#: breezy/builtins.py:2734
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
 # help of 'include-merged' option of 'log' command
-#: breezy/builtins.py:2738
+#: breezy/builtins.py:2736
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
 # help of 'omit-merges' option of 'log' command
-#: breezy/builtins.py:2742
+#: breezy/builtins.py:2740
 msgid "Do not report commits with more than one parent."
 msgstr ""
 
 # help of 'exclude-common-ancestry' option of 'log' command
-#: breezy/builtins.py:2744
+#: breezy/builtins.py:2742
 msgid ""
 "Display only the revisions that are not part of both ancestries (require -"
 "rX..Y)."
 msgstr ""
 
 # help of 'signatures' option of 'log' command
-#: breezy/builtins.py:2748
+#: breezy/builtins.py:2746
 msgid "Show digital signature validity."
 msgstr ""
 
 # help of 'match' option of 'log' command
-#: breezy/builtins.py:2751
+#: breezy/builtins.py:2749
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
 # help of 'match-message' option of 'log' command
-#: breezy/builtins.py:2755
+#: breezy/builtins.py:2753
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
 # help of 'match-committer' option of 'log' command
-#: breezy/builtins.py:2759
+#: breezy/builtins.py:2757
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
 # help of 'match-author' option of 'log' command
-#: breezy/builtins.py:2763
+#: breezy/builtins.py:2761
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
 # help of 'match-bugs' option of 'log' command
-#: breezy/builtins.py:2767
+#: breezy/builtins.py:2765
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: breezy/builtins.py:2807
+#: breezy/builtins.py:2805
 msgid "--exclude-common-ancestry requires -r with two revisions"
 msgstr ""
 
-#: breezy/builtins.py:2835
+#: breezy/builtins.py:2833
 #, python-format
 msgid "Path unknown at end or start of revision range: %s"
 msgstr ""
 
-#: breezy/builtins.py:2953
+#: breezy/builtins.py:2951
 #, python-format
 msgid "brz %s doesn't accept two revisions in different branches."
 msgstr ""
 
-#: breezy/builtins.py:2969
+#: breezy/builtins.py:2967
 #, python-format
 msgid "brz %s --revision takes one or two values."
 msgstr ""
 
-#: breezy/builtins.py:3014
+#: breezy/builtins.py:3012
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
 # help of 'recursive' option of 'ls' command
-#: breezy/builtins.py:3023
+#: breezy/builtins.py:3021
 msgid "Recurse into subdirectories."
 msgstr ""
 
 # help of 'from-root' option of 'ls' command
-#: breezy/builtins.py:3025
+#: breezy/builtins.py:3023
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
 # help of 'unknown' option of 'ls' command
-#: breezy/builtins.py:3027
+#: breezy/builtins.py:3025
 msgid "Print unknown files."
 msgstr ""
 
 # help of 'versioned' option of 'ls' command
-#: breezy/builtins.py:3028
+#: breezy/builtins.py:3026
 msgid "Print versioned files."
 msgstr ""
 
 # help of 'ignored' option of 'ls' command
-#: breezy/builtins.py:3031
+#: breezy/builtins.py:3029
 msgid "Print ignored files."
 msgstr ""
 
 # help of 'kind' option of 'ls' command
-#: breezy/builtins.py:3033
+#: breezy/builtins.py:3031
 msgid ""
 "List entries of a particular kind: file, directory, symlink, tree-reference."
 msgstr ""
 
-#: breezy/builtins.py:3048
+#: breezy/builtins.py:3046
 msgid "invalid kind specified"
 msgstr ""
 
-#: breezy/builtins.py:3052
+#: breezy/builtins.py:3050
 msgid "Cannot set both --verbose and --null"
 msgstr ""
 
-#: breezy/builtins.py:3061
+#: breezy/builtins.py:3059
 msgid "cannot specify both --from-root and PATH"
 msgstr ""
 
+#: breezy/builtins.py:3146
+msgid "Ignore specified files or patterns."
+msgstr ""
+
 #: breezy/builtins.py:3148
-msgid "Ignore specified files or patterns."
+msgid "See ``brz help patterns`` for details on the syntax of patterns."
 msgstr ""
 
 #: breezy/builtins.py:3150
-msgid "See ``brz help patterns`` for details on the syntax of patterns."
-msgstr ""
-
-#: breezy/builtins.py:3152
 msgid ""
 "If a .bzrignore file does not exist, the ignore command\n"
 "will create one and add the specified files or patterns to the newly\n"
@@ -2077,7 +2077,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: breezy/builtins.py:3158
+#: breezy/builtins.py:3156
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -2085,7 +2085,7 @@
 "it."
 msgstr ""
 
-#: breezy/builtins.py:3163
+#: breezy/builtins.py:3161
 msgid ""
 "Breezy also supports a global ignore file ~/.config/breezy/ignore. On\n"
 "Windows the global ignore file can be found in the application data\n"
@@ -2095,96 +2095,96 @@
 "can be edited directly using an editor."
 msgstr ""
 
-#: breezy/builtins.py:3170
+#: breezy/builtins.py:3168
 msgid ""
 "Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
 "precedence over regular ignores.  Such exceptions are used to specify\n"
 "files that should be versioned which would otherwise be ignored."
 msgstr ""
 
-#: breezy/builtins.py:3174
+#: breezy/builtins.py:3172
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
+#: breezy/builtins.py:3175
+msgid ":Notes:"
+msgstr ""
+
 #: breezy/builtins.py:3177
-msgid ":Notes:"
-msgstr ""
-
-#: breezy/builtins.py:3179
 msgid ""
 "* Ignore patterns containing shell wildcards must be quoted from\n"
 "  the shell on Unix."
 msgstr ""
 
-#: breezy/builtins.py:3182
+#: breezy/builtins.py:3180
 msgid ""
 "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
 "  To ignore patterns that begin with that character, use the \"RE:\" prefix."
 msgstr ""
 
-#: breezy/builtins.py:3185
+#: breezy/builtins.py:3183
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
+#: breezy/builtins.py:3186
+msgid "        brz ignore ./Makefile"
+msgstr ""
+
 #: breezy/builtins.py:3188
-msgid "        brz ignore ./Makefile"
+msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
 #: breezy/builtins.py:3190
-msgid "    Ignore .class files in all directories...::"
+msgid "        brz ignore \"*.class\""
 msgstr ""
 
 #: breezy/builtins.py:3192
-msgid "        brz ignore \"*.class\""
+msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
 #: breezy/builtins.py:3194
-msgid "    ...but do not ignore \"special.class\"::"
+msgid "        brz ignore \"!special.class\""
 msgstr ""
 
 #: breezy/builtins.py:3196
-msgid "        brz ignore \"!special.class\""
+msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
 #: breezy/builtins.py:3198
-msgid "    Ignore files whose name begins with the \"#\" character::"
-msgstr ""
-
-#: breezy/builtins.py:3200
 msgid "        brz ignore \"RE:^#\""
 msgstr ""
 
-#: breezy/builtins.py:3202 breezy/builtins.py:3206
+#: breezy/builtins.py:3200 breezy/builtins.py:3204
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: breezy/builtins.py:3204
+#: breezy/builtins.py:3202
 msgid "        brz ignore \"lib/**/*.o\""
 msgstr ""
 
+#: breezy/builtins.py:3206
+msgid "        brz ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
 #: breezy/builtins.py:3208
-msgid "        brz ignore \"RE:lib/.*\\.o\""
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
 #: breezy/builtins.py:3210
-msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgid "        brz ignore \"RE:(?!debian/).*\""
 msgstr ""
 
 #: breezy/builtins.py:3212
-msgid "        brz ignore \"RE:(?!debian/).*\""
-msgstr ""
-
-#: breezy/builtins.py:3214
 msgid ""
 "    Ignore everything except the \"local\" toplevel directory,\n"
 "    but always ignore autosave files ending in ~, even under local/::"
 msgstr ""
 
-#: breezy/builtins.py:3217
+#: breezy/builtins.py:3215
 msgid ""
 "        brz ignore \"*\"\n"
 "        brz ignore \"!./local\"\n"
@@ -2192,26 +2192,26 @@
 msgstr ""
 
 # help of 'default-rules' option of 'ignore' command
-#: breezy/builtins.py:3226
+#: breezy/builtins.py:3224
 msgid "Display the default ignore rules that brz uses."
 msgstr ""
 
-#: breezy/builtins.py:3238
+#: breezy/builtins.py:3236
 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
 msgstr ""
 
-#: breezy/builtins.py:3249
+#: breezy/builtins.py:3247
 #, python-format
 msgid "Invalid ignore pattern found. %s"
 msgid_plural "Invalid ignore patterns found. %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:3258
+#: breezy/builtins.py:3256
 msgid "NAME_PATTERN should not be an absolute path"
 msgstr ""
 
-#: breezy/builtins.py:3270
+#: breezy/builtins.py:3268
 #, python-format
 msgid ""
 "Warning: the following files are version controlled and match your ignore "
@@ -2221,62 +2221,62 @@
 "them.\n"
 msgstr ""
 
+#: breezy/builtins.py:3275
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
 #: breezy/builtins.py:3277
-msgid "List ignored files and the patterns that matched them."
-msgstr ""
-
-#: breezy/builtins.py:3279
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
+#: breezy/builtins.py:3280
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
 #: breezy/builtins.py:3282
-msgid "Alternatively, to list just the files::"
-msgstr ""
-
-#: breezy/builtins.py:3284
 msgid "    brz ls --ignored"
 msgstr ""
 
-#: breezy/builtins.py:3318
+#: breezy/builtins.py:3316
 #, python-format
 msgid "not a valid revision-number: %r"
 msgstr ""
 
+#: breezy/builtins.py:3324
+msgid "Export current or past revision to a destination directory or archive."
+msgstr ""
+
 #: breezy/builtins.py:3326
-msgid "Export current or past revision to a destination directory or archive."
+msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
 #: breezy/builtins.py:3328
-msgid "If no revision is specified this exports the last committed revision."
-msgstr ""
-
-#: breezy/builtins.py:3330
 msgid ""
 "Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
 "given, try to find the format with the extension. If no extension\n"
 "is found exports to a directory (equivalent to --format=dir)."
 msgstr ""
 
-#: breezy/builtins.py:3334
+#: breezy/builtins.py:3332
 msgid ""
 "If root is supplied, it will be used as the root directory inside\n"
 "container formats (tar, zip, etc). If it is not supplied it will default\n"
 "to the exported filename. The root option has no effect for 'dir' format."
 msgstr ""
 
-#: breezy/builtins.py:3338
+#: breezy/builtins.py:3336
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
+#: breezy/builtins.py:3339
+msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
 #: breezy/builtins.py:3341
-msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
-msgstr ""
-
-#: breezy/builtins.py:3343
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -2290,78 +2290,83 @@
 msgstr ""
 
 # help of 'format' option of 'export' command
-#: breezy/builtins.py:3358
+#: breezy/builtins.py:3356
 msgid "Type of file to export to."
 msgstr ""
 
 # help of 'filters' option of 'export' command
-#: breezy/builtins.py:3361
+#: breezy/builtins.py:3359
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
 # help of 'root' option of 'export' command
-#: breezy/builtins.py:3365
+#: breezy/builtins.py:3363
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
 # help of 'per-file-timestamps' option of 'export' command
-#: breezy/builtins.py:3367
+#: breezy/builtins.py:3365
 msgid ""
 "Set modification time of files to that of the last revision in which it was "
 "changed."
 msgstr ""
 
 # help of 'uncommitted' option of 'export' command
-#: breezy/builtins.py:3370
+#: breezy/builtins.py:3368
 msgid "Export the working tree contents rather than that of the last revision."
 msgstr ""
 
+# help of 'recurse-nested' option of 'export' command
+#: breezy/builtins.py:3371
+msgid "Include contents of nested trees."
+msgstr ""
+
 #: breezy/builtins.py:3390
 msgid "--uncommitted requires a working tree"
 msgstr ""
 
-#: breezy/builtins.py:3418
+#: breezy/builtins.py:3419
 #, python-format
 msgid "Unsupported export format: %s"
 msgstr ""
 
-#: breezy/builtins.py:3422
+#: breezy/builtins.py:3423
 msgid "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: breezy/builtins.py:3424
+#: breezy/builtins.py:3425
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: breezy/builtins.py:3426
+#: breezy/builtins.py:3427
 msgid ""
 "Note: Take care to redirect standard output when using this command on a\n"
 "binary file."
 msgstr ""
 
 # help of 'name-from-revision' option of 'cat' command
-#: breezy/builtins.py:3433
+#: breezy/builtins.py:3434
 msgid "The path name in the old tree."
 msgstr ""
 
 # help of 'filters' option of 'cat' command
-#: breezy/builtins.py:3434
+#: breezy/builtins.py:3435
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: breezy/builtins.py:3445
+#: breezy/builtins.py:3446
 msgid "brz cat --revision takes exactly one revision specifier"
 msgstr ""
 
-#: breezy/builtins.py:3465 breezy/builtins.py:3479
+#: breezy/builtins.py:3466 breezy/builtins.py:3480
 msgid "{0!r} is not present in revision {1}"
 msgstr ""
 
-#: breezy/builtins.py:3506
+#: breezy/builtins.py:3507
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: breezy/builtins.py:3508
+#: breezy/builtins.py:3509
 msgid ""
 "An explanatory message needs to be given for each commit. This is\n"
 "often done by using the --message option (getting the message from the\n"
@@ -2371,44 +2376,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: breezy/builtins.py:3515
+#: breezy/builtins.py:3516
 msgid ""
 "By default, the entire tree is committed and the person doing the\n"
 "commit is assumed to be the author. These defaults can be overridden\n"
 "as explained below."
 msgstr ""
 
-#: breezy/builtins.py:3519
+#: breezy/builtins.py:3520
 msgid ":Selective commits:"
 msgstr ""
 
-#: breezy/builtins.py:3521
+#: breezy/builtins.py:3522
 msgid ""
 "  If selected files are specified, only changes to those files are\n"
 "  committed.  If a directory is specified then the directory and\n"
 "  everything within it is committed."
 msgstr ""
 
-#: breezy/builtins.py:3525
+#: breezy/builtins.py:3526
 msgid ""
 "  When excludes are given, they take precedence over selected files.\n"
 "  For example, to commit only changes within foo, but not changes\n"
 "  within foo/bar::"
 msgstr ""
 
-#: breezy/builtins.py:3529
+#: breezy/builtins.py:3530
 msgid "    brz commit foo -x foo/bar"
 msgstr ""
 
-#: breezy/builtins.py:3531
+#: breezy/builtins.py:3532
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: breezy/builtins.py:3533
+#: breezy/builtins.py:3534
 msgid ":Custom authors:"
 msgstr ""
 
-#: breezy/builtins.py:3535
+#: breezy/builtins.py:3536
 msgid ""
 "  If the author of the change is not the same person as the committer,\n"
 "  you can specify the author's name using the --author option. The\n"
@@ -2418,11 +2423,11 @@
 "  author."
 msgstr ""
 
-#: breezy/builtins.py:3542
+#: breezy/builtins.py:3543
 msgid ":Checks:"
 msgstr ""
 
-#: breezy/builtins.py:3544
+#: breezy/builtins.py:3545
 msgid ""
 "  A common mistake is to forget to add a new file or directory before\n"
 "  running the commit command. The --strict option checks for unknown\n"
@@ -2431,18 +2436,18 @@
 "  for details."
 msgstr ""
 
-#: breezy/builtins.py:3550
+#: breezy/builtins.py:3551
 msgid ":Things to note:"
 msgstr ""
 
-#: breezy/builtins.py:3552
+#: breezy/builtins.py:3553
 msgid ""
 "  If you accidentally commit the wrong changes or make a spelling\n"
 "  mistake in the commit message say, you can use the uncommit command\n"
 "  to undo it. See ``brz help uncommit`` for details."
 msgstr ""
 
-#: breezy/builtins.py:3556
+#: breezy/builtins.py:3557
 msgid ""
 "  Hooks can also be configured to run after a commit. This allows you\n"
 "  to trigger updates to external systems like bug trackers. The --fixes\n"
@@ -2451,74 +2456,74 @@
 msgstr ""
 
 # help of 'exclude' option of 'commit' command
-#: breezy/builtins.py:3567
+#: breezy/builtins.py:3568
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
 # help of 'message' option of 'commit' command
-#: breezy/builtins.py:3570
+#: breezy/builtins.py:3571
 msgid "Description of the new revision."
 msgstr ""
 
 # help of 'unchanged' option of 'commit' command
-#: breezy/builtins.py:3573
+#: breezy/builtins.py:3574
 msgid "Commit even if nothing has changed."
 msgstr ""
 
 # help of 'file' option of 'commit' command
-#: breezy/builtins.py:3577
+#: breezy/builtins.py:3578
 msgid "Take commit message from this file."
 msgstr ""
 
 # help of 'strict' option of 'commit' command
-#: breezy/builtins.py:3579
+#: breezy/builtins.py:3580
 msgid "Refuse to commit if there are unknown files in the working tree."
 msgstr ""
 
 # help of 'commit-time' option of 'commit' command
-#: breezy/builtins.py:3582
+#: breezy/builtins.py:3583
 msgid ""
 "Manually set a commit time using commit date format, e.g. '2009-10-10 "
 "08:00:00 +0100'."
 msgstr ""
 
 # help of 'bugs' option of 'commit' command
-#: breezy/builtins.py:3586
+#: breezy/builtins.py:3587
 msgid "Link to a related bug. (see \"brz help bugs\")."
 msgstr ""
 
 # help of 'fixes' option of 'commit' command
-#: breezy/builtins.py:3589
+#: breezy/builtins.py:3590
 msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
 msgstr ""
 
 # help of 'author' option of 'commit' command
-#: breezy/builtins.py:3593
+#: breezy/builtins.py:3594
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
 # help of 'local' option of 'commit' command
-#: breezy/builtins.py:3596
+#: breezy/builtins.py:3597
 msgid ""
 "Perform a local commit in a bound branch.  Local commits are not pushed to "
 "the master branch until a normal commit is performed."
 msgstr ""
 
 # help of 'show-diff' option of 'commit' command
-#: breezy/builtins.py:3602
+#: breezy/builtins.py:3603
 msgid ""
 "When no message is supplied, show the diff along with the status summary in "
 "the message editor."
 msgstr ""
 
 # help of 'lossy' option of 'commit' command
-#: breezy/builtins.py:3605
+#: breezy/builtins.py:3606
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: breezy/builtins.py:3622
+#: breezy/builtins.py:3623
 #, python-format
 msgid ""
 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
@@ -2526,7 +2531,7 @@
 "See \"brz help bugs\" for more information on this feature. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3631
+#: breezy/builtins.py:3632
 #, python-format
 msgid ""
 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
@@ -2534,91 +2539,91 @@
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3640
+#: breezy/builtins.py:3641
 #, python-format
 msgid "Unrecognized bug %s. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3643
+#: breezy/builtins.py:3644
 #, python-format
 msgid ""
 "%s\n"
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3670
+#: breezy/builtins.py:3671
 msgid "Could not parse --commit-time: "
 msgstr ""
 
-#: breezy/builtins.py:3714
+#: breezy/builtins.py:3715
 msgid "please specify either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3744
+#: breezy/builtins.py:3745
 msgid "please specify a commit message with either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3747
+#: breezy/builtins.py:3748
 msgid ""
 "Empty commit message specified. Please specify a commit message with either "
 "--message or --file or leave a blank message with --message \"\"."
 msgstr ""
 
-#: breezy/builtins.py:3767
+#: breezy/builtins.py:3768
 msgid ""
 "No changes to commit. Please 'brz add' the files you want to commit, or use "
 "--unchanged to force an empty commit."
 msgstr ""
 
-#: breezy/builtins.py:3771
+#: breezy/builtins.py:3772
 msgid ""
 "Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
 "resolve FILE\" to resolve."
 msgstr ""
 
-#: breezy/builtins.py:3775
+#: breezy/builtins.py:3776
 msgid "Commit refused because there are unknown files in the working tree."
 msgstr ""
 
-#: breezy/builtins.py:3778
+#: breezy/builtins.py:3779
 msgid ""
 "\n"
 "To commit to master branch, run update and then commit.\n"
 "You can also pass --local to commit to continue working disconnected."
 msgstr ""
 
-#: breezy/builtins.py:3786
+#: breezy/builtins.py:3787
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: breezy/builtins.py:3788
+#: breezy/builtins.py:3789
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or brz bugs."
 msgstr ""
 
-#: breezy/builtins.py:3791
+#: breezy/builtins.py:3792
 msgid ""
 "The working tree and branch checks will only give output if a problem is\n"
 "detected. The output fields of the repository check are:"
 msgstr ""
 
-#: breezy/builtins.py:3794
+#: breezy/builtins.py:3795
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3798
+#: breezy/builtins.py:3799
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3802
+#: breezy/builtins.py:3803
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
@@ -2626,14 +2631,14 @@
 "    subtle problem that Breezy can work around."
 msgstr ""
 
-#: breezy/builtins.py:3807
+#: breezy/builtins.py:3808
 msgid ""
 "unique file texts\n"
 "    This is the total number of unique file contents\n"
 "    seen in the checked revisions.  It does not indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3811
+#: breezy/builtins.py:3812
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -2642,56 +2647,56 @@
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3817
+#: breezy/builtins.py:3818
 msgid ""
 "If no restrictions are specified, all data that is found at the given\n"
 "location will be checked."
 msgstr ""
 
-#: breezy/builtins.py:3822
+#: breezy/builtins.py:3823
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: breezy/builtins.py:3824
+#: breezy/builtins.py:3825
 msgid "        brz check --tree --branch foo"
 msgstr ""
 
-#: breezy/builtins.py:3826
+#: breezy/builtins.py:3827
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: breezy/builtins.py:3828
+#: breezy/builtins.py:3829
 msgid "        brz check --repo bar"
 msgstr ""
 
-#: breezy/builtins.py:3830
+#: breezy/builtins.py:3831
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: breezy/builtins.py:3832
+#: breezy/builtins.py:3833
 msgid "        brz check baz"
 msgstr ""
 
 # help of 'branch' option of 'check' command
-#: breezy/builtins.py:3838
+#: breezy/builtins.py:3839
 msgid "Check the branch related to the current directory."
 msgstr ""
 
 # help of 'repo' option of 'check' command
-#: breezy/builtins.py:3840
+#: breezy/builtins.py:3841
 msgid "Check the repository related to the current directory."
 msgstr ""
 
 # help of 'tree' option of 'check' command
-#: breezy/builtins.py:3842
+#: breezy/builtins.py:3843
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: breezy/builtins.py:3856
+#: breezy/builtins.py:3857
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: breezy/builtins.py:3858
+#: breezy/builtins.py:3859
 msgid ""
 "When the default format has changed after a major new release of\n"
 "Bazaar/Breezy, you may be informed during certain operations that you\n"
@@ -2700,7 +2705,7 @@
 "with older repositories or with older versions of Bazaar or Breezy."
 msgstr ""
 
-#: breezy/builtins.py:3864
+#: breezy/builtins.py:3865
 msgid ""
 "If you wish to upgrade to a particular format rather than the\n"
 "current default, that can be specified using the --format option.\n"
@@ -2710,7 +2715,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: breezy/builtins.py:3871
+#: breezy/builtins.py:3872
 msgid ""
 "A backup.bzr.~#~ directory is created at the start of the conversion\n"
 "process (where # is a number). By default, this is left there on\n"
@@ -2721,7 +2726,7 @@
 "afterwards."
 msgstr ""
 
-#: breezy/builtins.py:3879
+#: breezy/builtins.py:3880
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -2729,171 +2734,171 @@
 "tried."
 msgstr ""
 
-#: breezy/builtins.py:3884
+#: breezy/builtins.py:3885
 msgid ""
 "For more information on upgrades, see the Breezy Upgrade Guide,\n"
 "https://www.breezy-vcs.org/doc/en/upgrade-guide/."
 msgstr ""
 
 # help of 'format' option of 'upgrade' command
-#: breezy/builtins.py:3892
+#: breezy/builtins.py:3893
 msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init' command
 # title of 'format' option of 'upgrade' command
-#: breezy/builtins.py:3897
+#: breezy/builtins.py:3898
 msgid "Branch format"
 msgstr ""
 
 # help of 'clean' option of 'upgrade' command
-#: breezy/builtins.py:3899
+#: breezy/builtins.py:3900
 msgid "Remove the backup.bzr directory if successful."
 msgstr ""
 
 # help of 'dry-run' option of 'add' command
 # help of 'dry-run' option of 'upgrade' command
 # help of 'dry-run' option of 'rebase' command
-#: breezy/builtins.py:3901 breezy/plugins/rewrite/commands.py:95
+#: breezy/builtins.py:3902 breezy/plugins/rewrite/commands.py:97
 msgid "Show what would be done, but don't actually do anything."
 msgstr ""
 
-#: breezy/builtins.py:3916
+#: breezy/builtins.py:3917
 msgid "Show or set brz user id."
 msgstr ""
 
-#: breezy/builtins.py:3918
+#: breezy/builtins.py:3919
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3921
+#: breezy/builtins.py:3922
 msgid "        brz whoami --email"
 msgstr ""
 
-#: breezy/builtins.py:3923
+#: breezy/builtins.py:3924
 msgid "    Set the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3925
+#: breezy/builtins.py:3926
 msgid "        brz whoami \"Frank Chu <[e-mail]>\""
 msgstr ""
 
 # help of 'email' option of 'whoami' command
-#: breezy/builtins.py:3929
+#: breezy/builtins.py:3930
 msgid "Display email address only."
 msgstr ""
 
 # help of 'branch' option of 'whoami' command
-#: breezy/builtins.py:3931
+#: breezy/builtins.py:3932
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: breezy/builtins.py:3957
+#: breezy/builtins.py:3958
 msgid "--email can only be used to display existing identity"
 msgstr ""
 
-#: breezy/builtins.py:3981
+#: breezy/builtins.py:3982
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: breezy/builtins.py:3983
+#: breezy/builtins.py:3984
 msgid ""
 "If unset, the colocated branch name is used for colocated branches, and\n"
 "the branch directory name is used for other branches.  To print the\n"
 "current nickname, execute with no argument."
 msgstr ""
 
-#: breezy/builtins.py:3987
+#: breezy/builtins.py:3988
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: breezy/builtins.py:4008
+#: breezy/builtins.py:4009
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: breezy/builtins.py:4010
+#: breezy/builtins.py:4011
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: breezy/builtins.py:4013
+#: breezy/builtins.py:4014
 msgid "        brz alias"
 msgstr ""
 
-#: breezy/builtins.py:4015
+#: breezy/builtins.py:4016
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4017
+#: breezy/builtins.py:4018
 msgid "        brz alias ll"
 msgstr ""
 
-#: breezy/builtins.py:4019
+#: breezy/builtins.py:4020
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4021
+#: breezy/builtins.py:4022
 msgid "        brz alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: breezy/builtins.py:4023
+#: breezy/builtins.py:4024
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4025
+#: breezy/builtins.py:4026
 msgid "        brz alias --remove ll"
 msgstr ""
 
 # help of 'remove' option of 'alias' command
-#: breezy/builtins.py:4030
+#: breezy/builtins.py:4031
 msgid "Remove the alias."
 msgstr ""
 
-#: breezy/builtins.py:4048
+#: breezy/builtins.py:4049
 msgid "brz alias --remove expects an alias to remove."
 msgstr ""
 
-#: breezy/builtins.py:4239
+#: breezy/builtins.py:4240
 msgid "subunit not available. subunit needs to be installed to use --subunit."
 msgstr ""
 
-#: breezy/builtins.py:4256
+#: breezy/builtins.py:4257
 msgid "subunit not available. subunit needs to be installed to use --subunit2."
 msgstr ""
 
-#: breezy/builtins.py:4265
+#: breezy/builtins.py:4266
 msgid ""
 "--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
 msgstr ""
 
-#: breezy/builtins.py:4312
+#: breezy/builtins.py:4313
 msgid "Show version of brz."
 msgstr ""
 
 # help of 'short' option of 'version' command
-#: breezy/builtins.py:4316
+#: breezy/builtins.py:4317
 msgid "Print just the version number."
 msgstr ""
 
-#: breezy/builtins.py:4335
+#: breezy/builtins.py:4336
 msgid "It sure does!\n"
 msgstr ""
 
-#: breezy/builtins.py:4359
+#: breezy/builtins.py:4358
 #, python-format
 msgid "merge base is revision %s\n"
 msgstr ""
 
-#: breezy/builtins.py:4364
+#: breezy/builtins.py:4363
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: breezy/builtins.py:4366
+#: breezy/builtins.py:4365
 msgid ""
 "The source of the merge can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
@@ -2904,20 +2909,20 @@
 "the current working tree."
 msgstr ""
 
-#: breezy/builtins.py:4374
+#: breezy/builtins.py:4373
 msgid ""
 "When merging from a branch, by default brz will try to merge in all new\n"
 "work from the other branch, automatically determining an appropriate base\n"
 "revision.  If this fails, you may need to give an explicit base."
 msgstr ""
 
-#: breezy/builtins.py:4378
+#: breezy/builtins.py:4377
 msgid ""
 "To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
 "try to merge in all new work up to and including revision OTHER."
 msgstr ""
 
-#: breezy/builtins.py:4381
+#: breezy/builtins.py:4380
 msgid ""
 "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
 "through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
@@ -2928,11 +2933,11 @@
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: breezy/builtins.py:4389
+#: breezy/builtins.py:4388
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: breezy/builtins.py:4391 breezy/conflicts.py:46 breezy/conflicts.py:103
+#: breezy/builtins.py:4390 breezy/conflicts.py:45 breezy/conflicts.py:102
 msgid ""
 "Merge will do its best to combine the changes in two branches, but there\n"
 "are some kinds of problems only a human can fix.  When it encounters those,\n"
@@ -2940,11 +2945,11 @@
 "before you can commit."
 msgstr ""
 
-#: breezy/builtins.py:4396
+#: breezy/builtins.py:4395
 msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4398
+#: breezy/builtins.py:4397
 msgid ""
 "If there is no default branch set, the first merge will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the branch\n"
@@ -2952,14 +2957,14 @@
 "only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:4403
+#: breezy/builtins.py:4402
 msgid ""
 "The results of the merge are placed into the destination working\n"
 "directory, where they can be reviewed (with brz diff), tested, and then\n"
 "committed to record the result of the merge."
 msgstr ""
 
-#: breezy/builtins.py:4407
+#: breezy/builtins.py:4406
 msgid ""
 "merge refuses to run if there are any uncommitted changes, unless\n"
 "--force is given.  If --force is given, then the changes from the source\n"
@@ -2968,60 +2973,60 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: breezy/builtins.py:4413
+#: breezy/builtins.py:4412
 msgid ""
 "If one would like to merge changes from the working tree of the other\n"
 "branch without merging any committed revisions, the --uncommitted option\n"
 "can be given."
 msgstr ""
 
-#: breezy/builtins.py:4417
+#: breezy/builtins.py:4416
 msgid ""
 "To select only some changes to merge, use \"merge -i\", which will prompt\n"
 "you to apply each diff hunk and file change, similar to \"shelve\"."
 msgstr ""
 
-#: breezy/builtins.py:4420
+#: breezy/builtins.py:4419
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4423
+#: breezy/builtins.py:4422
 msgid "        brz merge ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4425
+#: breezy/builtins.py:4424
 msgid "    To merge changes up to and including revision 82 from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4427
+#: breezy/builtins.py:4426
 msgid "        brz merge -r 82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4429
+#: breezy/builtins.py:4428
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: breezy/builtins.py:4431
+#: breezy/builtins.py:4430
 msgid "        brz merge -r 81..82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4433
+#: breezy/builtins.py:4432
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: breezy/builtins.py:4435
+#: breezy/builtins.py:4434
 msgid "        brz merge /tmp/merge"
 msgstr ""
 
-#: breezy/builtins.py:4437
+#: breezy/builtins.py:4436
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: breezy/builtins.py:4440
+#: breezy/builtins.py:4439
 msgid ""
 "        brz merge ../feature1a\n"
 "        brz merge ../feature1b --force\n"
@@ -3029,18 +3034,18 @@
 msgstr ""
 
 # help of 'force' option of 'merge' command
-#: breezy/builtins.py:4452
+#: breezy/builtins.py:4451
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
 # help of 'uncommitted' option of 'merge' command
-#: breezy/builtins.py:4458
+#: breezy/builtins.py:4457
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
 # help of 'pull' option of 'merge' command
-#: breezy/builtins.py:4460
+#: breezy/builtins.py:4459
 msgid ""
 "If the destination is already completely merged into the source, pull from "
 "the source rather than merging.  When this happens, you do not need to "
@@ -3048,115 +3053,115 @@
 msgstr ""
 
 # help of 'directory' option of 'merge' command
-#: breezy/builtins.py:4465
+#: breezy/builtins.py:4464
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'preview' option of 'merge' command
-#: breezy/builtins.py:4467
+#: breezy/builtins.py:4466
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
 # help of 'interactive' option of 'merge' command
-#: breezy/builtins.py:4469
+#: breezy/builtins.py:4468
 msgid "Select changes interactively."
 msgstr ""
 
-#: breezy/builtins.py:4492
+#: breezy/builtins.py:4491
 msgid ""
 "Merging into empty branches not currently supported, https://bugs.launchpad."
 "net/bzr/+bug/308562"
 msgstr ""
 
-#: breezy/builtins.py:4514
+#: breezy/builtins.py:4513
 msgid "Cannot use --uncommitted with bundles or merge directives."
 msgstr ""
 
-#: breezy/builtins.py:4525
+#: breezy/builtins.py:4524
 msgid "Cannot use --uncommitted and --revision at the same time."
 msgstr ""
 
-#: breezy/builtins.py:4545
+#: breezy/builtins.py:4544
 msgid "merger: "
 msgstr ""
 
-#: breezy/builtins.py:4547 breezy/bzr/bundle/apply_bundle.py:63
-#: breezy/plugins/rewrite/commands.py:516
+#: breezy/builtins.py:4546 breezy/bzr/bundle/apply_bundle.py:63
+#: breezy/plugins/rewrite/commands.py:518
 msgid "Nothing to do."
 msgstr ""
 
-#: breezy/builtins.py:4552
+#: breezy/builtins.py:4551
 msgid "Cannot pull individual files"
 msgstr ""
 
-#: breezy/builtins.py:4560
+#: breezy/builtins.py:4559
 msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
 msgstr ""
 
-#: breezy/builtins.py:4618
+#: breezy/builtins.py:4617
 #, python-format
 msgid "Show-base is not supported for this merge type. %s"
 msgstr ""
 
-#: breezy/builtins.py:4627
+#: breezy/builtins.py:4626
 #, python-format
 msgid "Conflict reduction is not supported for merge type %s."
 msgstr ""
 
-#: breezy/builtins.py:4631
+#: breezy/builtins.py:4630
 msgid "Cannot do conflict reduction and show base."
 msgstr ""
 
-#: breezy/builtins.py:4640
+#: breezy/builtins.py:4639
 msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
 msgstr ""
 
+#: breezy/builtins.py:4749
+msgid "No location specified or remembered"
+msgstr ""
+
 #: breezy/builtins.py:4751
-msgid "No location specified or remembered"
-msgstr ""
-
-#: breezy/builtins.py:4753
 #, python-brace-format
 msgid "{0} remembered {1} location {2}"
 msgstr ""
 
+#: breezy/builtins.py:4757
+msgid "Redo a merge."
+msgstr ""
+
 #: breezy/builtins.py:4759
-msgid "Redo a merge."
-msgstr ""
-
-#: breezy/builtins.py:4761
 msgid ""
 "Use this if you want to try a different merge technique while resolving\n"
 "conflicts.  Some merge techniques are better than others, and remerge\n"
 "lets you try different ones on different files."
 msgstr ""
 
-#: breezy/builtins.py:4765
+#: breezy/builtins.py:4763
 msgid ""
 "The options for remerge have the same meaning and defaults as the ones for\n"
 "merge.  The difference is that remerge can (only) be run when there is a\n"
 "pending merge, and it lets you specify particular files."
 msgstr ""
 
-#: breezy/builtins.py:4769
+#: breezy/builtins.py:4767
 msgid ""
 ":Examples:\n"
 "    Re-do the merge of all conflicted files, and show the base text in\n"
 "    conflict regions, in addition to the usual THIS and OTHER texts::"
 msgstr ""
 
+#: breezy/builtins.py:4771
+msgid "        brz remerge --show-base"
+msgstr ""
+
 #: breezy/builtins.py:4773
-msgid "        brz remerge --show-base"
-msgstr ""
-
-#: breezy/builtins.py:4775
 msgid ""
 "    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
 "    additional processing to reduce the size of conflict regions::"
 msgstr ""
 
-#: breezy/builtins.py:4778
+#: breezy/builtins.py:4776
 msgid "        brz remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
@@ -3164,23 +3169,23 @@
 # help of 'show-base' option of 'pull' command
 # help of 'show-base' option of 'remerge' command
 # help of 'show-base' option of 'update' command
-#: breezy/builtins.py:4785
+#: breezy/builtins.py:4783
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4798
+#: breezy/builtins.py:4796
 msgid ""
 "Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
 "merges."
 msgstr ""
 
+#: breezy/builtins.py:4850
+msgid ""
+"Set files in the working tree back to the contents of a previous revision."
+msgstr ""
+
 #: breezy/builtins.py:4852
 msgid ""
-"Set files in the working tree back to the contents of a previous revision."
-msgstr ""
-
-#: breezy/builtins.py:4854
-msgid ""
 "Giving a list of files will revert only those files.  Otherwise, all files\n"
 "will be reverted.  If the revision is not specified with '--revision', the\n"
 "working tree basis revision is used. A revert operation affects only the\n"
@@ -3188,7 +3193,7 @@
 "the working tree basis revision."
 msgstr ""
 
-#: breezy/builtins.py:4860
+#: breezy/builtins.py:4858
 msgid ""
 "To remove only some changes, without reverting to a prior version, use\n"
 "merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
@@ -3200,7 +3205,7 @@
 "update command."
 msgstr ""
 
-#: breezy/builtins.py:4869
+#: breezy/builtins.py:4867
 msgid ""
 "Uncommitted changes to files that are reverted will be discarded.\n"
 "However, by default, any files that have been manually changed will be\n"
@@ -3208,7 +3213,7 @@
 "files have '.~#~' appended to their name, where # is a number."
 msgstr ""
 
-#: breezy/builtins.py:4874
+#: breezy/builtins.py:4872
 msgid ""
 "When you provide files, you can use their current pathname or the pathname\n"
 "from the target revision.  So you can use revert to \"undelete\" a file by\n"
@@ -3216,7 +3221,7 @@
 "reverted."
 msgstr ""
 
-#: breezy/builtins.py:4879
+#: breezy/builtins.py:4877
 msgid ""
 "If you have newly added files since the target revision, they will be\n"
 "removed.  If the files to be removed have been changed, backups will be\n"
@@ -3224,7 +3229,7 @@
 "deleted."
 msgstr ""
 
-#: breezy/builtins.py:4884
+#: breezy/builtins.py:4882
 msgid ""
 "The working tree contains a list of revisions that have been merged but\n"
 "not yet committed. These revisions will be included as additional parents\n"
@@ -3236,7 +3241,7 @@
 "reverting any files."
 msgstr ""
 
-#: breezy/builtins.py:4893
+#: breezy/builtins.py:4891
 msgid ""
 "Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
 "changes from a branch in a single revision.  To do this, perform the merge\n"
@@ -3251,177 +3256,177 @@
 msgstr ""
 
 # help of 'no-backup' option of 'revert' command
-#: breezy/builtins.py:4908
+#: breezy/builtins.py:4906
 msgid "Do not save backups of reverted files."
 msgstr ""
 
 # help of 'forget-merges' option of 'revert' command
-#: breezy/builtins.py:4910
+#: breezy/builtins.py:4908
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: breezy/builtins.py:4941
+#: breezy/builtins.py:4939
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
 # help of 'long' option of 'help' command
-#: breezy/builtins.py:4946
+#: breezy/builtins.py:4944
 msgid "Show help on all commands."
 msgstr ""
 
+#: breezy/builtins.py:4973
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
 #: breezy/builtins.py:4975
-msgid "Show unmerged/unpulled revisions between two branches."
+msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
 #: breezy/builtins.py:4977
-msgid "OTHER_BRANCH may be local or remote."
-msgstr ""
-
-#: breezy/builtins.py:4979
 msgid ""
 "To filter on a range of revisions, you can use the command -r begin..end\n"
 "-r revision requests a specific revision, -r ..end or -r begin.. are\n"
 "also valid."
 msgstr ""
 
-#: breezy/builtins.py:4983
+#: breezy/builtins.py:4981
 msgid ""
 ":Exit values:\n"
 "    1 - some missing revisions\n"
 "    0 - no missing revisions"
 msgstr ""
 
-#: breezy/builtins.py:4989
+#: breezy/builtins.py:4987
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
+#: breezy/builtins.py:4990
+msgid "        brz missing"
+msgstr ""
+
 #: breezy/builtins.py:4992
-msgid "        brz missing"
+msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
 #: breezy/builtins.py:4994
-msgid "    Determine the missing revisions between this and another branch::"
+msgid "        brz missing http://server/branch"
 msgstr ""
 
 #: breezy/builtins.py:4996
-msgid "        brz missing http://server/branch"
-msgstr ""
-
-#: breezy/builtins.py:4998
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
+#: breezy/builtins.py:4999
+msgid "        brz missing -r ..-10"
+msgstr ""
+
 #: breezy/builtins.py:5001
-msgid "        brz missing -r ..-10"
-msgstr ""
-
-#: breezy/builtins.py:5003
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: breezy/builtins.py:5006
+#: breezy/builtins.py:5004
 msgid "        brz missing --my-revision ..-10"
 msgstr ""
 
 # help of 'reverse' option of 'missing' command
-#: breezy/builtins.py:5013
+#: breezy/builtins.py:5011
 msgid "Reverse the order of revisions."
 msgstr ""
 
 # help of 'mine-only' option of 'missing' command
-#: breezy/builtins.py:5015
+#: breezy/builtins.py:5013
 msgid "Display changes in the local branch only."
 msgstr ""
 
 # help of 'this' option of 'missing' command
-#: breezy/builtins.py:5016
+#: breezy/builtins.py:5014
 msgid "Same as --mine-only."
 msgstr ""
 
 # help of 'theirs-only' option of 'missing' command
-#: breezy/builtins.py:5018
+#: breezy/builtins.py:5016
 msgid "Display changes in the remote branch only."
 msgstr ""
 
 # help of 'other' option of 'missing' command
-#: breezy/builtins.py:5019
+#: breezy/builtins.py:5017
 msgid "Same as --theirs-only."
 msgstr ""
 
 # help of 'revision' option of 'missing' command
-#: breezy/builtins.py:5024
+#: breezy/builtins.py:5022
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'my-revision' option of 'missing' command
-#: breezy/builtins.py:5028
+#: breezy/builtins.py:5026
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'include-merged' option of 'missing' command
-#: breezy/builtins.py:5031
+#: breezy/builtins.py:5029
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: breezy/builtins.py:5072
+#: breezy/builtins.py:5070
 msgid "No peer location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:5076
+#: breezy/builtins.py:5074
 #, python-brace-format
 msgid "Using saved parent location: {0}\n"
 msgstr ""
 
-#: breezy/builtins.py:5109
+#: breezy/builtins.py:5107
 #, python-format
 msgid "You have %d extra revision:\n"
 msgid_plural "You have %d extra revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5129
+#: breezy/builtins.py:5127
 #, python-format
 msgid "You are missing %d revision:\n"
 msgid_plural "You are missing %d revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5144
+#: breezy/builtins.py:5142
 msgid "This branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5147
+#: breezy/builtins.py:5145
 msgid "Other branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5152
+#: breezy/builtins.py:5150
 msgid "Branches are up to date.\n"
 msgstr ""
 
+#: breezy/builtins.py:5161
+msgid "Compress the data within a repository."
+msgstr ""
+
 #: breezy/builtins.py:5163
-msgid "Compress the data within a repository."
-msgstr ""
-
-#: breezy/builtins.py:5165
 msgid ""
 "This operation compresses the data within a bazaar repository. As\n"
 "bazaar supports automatic packing of repository, this operation is\n"
 "normally not required to be done manually."
 msgstr ""
 
-#: breezy/builtins.py:5169
+#: breezy/builtins.py:5167
 msgid ""
 "During the pack operation, bazaar takes a backup of existing repository\n"
 "data, i.e. pack files. This backup is eventually removed by bazaar\n"
@@ -3430,7 +3435,7 @@
 "used."
 msgstr ""
 
-#: breezy/builtins.py:5175
+#: breezy/builtins.py:5173
 msgid ""
 "Warning: If you use --clean-obsolete-packs and your machine crashes\n"
 "during or immediately after repacking, you may be left with a state\n"
@@ -3439,25 +3444,25 @@
 msgstr ""
 
 # help of 'clean-obsolete-packs' option of 'pack' command
-#: breezy/builtins.py:5185
+#: breezy/builtins.py:5183
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
+#: breezy/builtins.py:5197
+msgid "List the installed plugins."
+msgstr ""
+
 #: breezy/builtins.py:5199
-msgid "List the installed plugins."
-msgstr ""
-
-#: breezy/builtins.py:5201
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
+#: breezy/builtins.py:5202
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
 #: breezy/builtins.py:5204
-msgid "--verbose shows the path where each plugin is located."
-msgstr ""
-
-#: breezy/builtins.py:5206
 msgid ""
 "A plugin is an external component for Breezy that extends the\n"
 "revision control system, by adding or replacing code in Breezy.\n"
@@ -3466,130 +3471,130 @@
 "customizing log output."
 msgstr ""
 
-#: breezy/builtins.py:5212
+#: breezy/builtins.py:5210
 msgid ""
-"See the Bazaar Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>\n"
+"See the Breezy Plugin Guide <https://www.breezy-vcs.org/doc/plugins/en/>\n"
 "for further information on plugins including where to find them and how to\n"
 "install them. Instructions are also provided there on how to write new\n"
 "plugins using the Python programming language."
 msgstr ""
 
-#: breezy/builtins.py:5228
+#: breezy/builtins.py:5226
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
 # help of 'long' option of 'testament' command
-#: breezy/builtins.py:5231
+#: breezy/builtins.py:5229
 msgid "Produce long-format testament."
 msgstr ""
 
 # help of 'strict' option of 'testament' command
-#: breezy/builtins.py:5233
+#: breezy/builtins.py:5231
 msgid "Produce a strict-format testament."
 msgstr ""
 
+#: breezy/builtins.py:5259
+msgid "Show the origin of each line in a file."
+msgstr ""
+
 #: breezy/builtins.py:5261
-msgid "Show the origin of each line in a file."
-msgstr ""
-
-#: breezy/builtins.py:5263
 msgid ""
 "This prints out the given file with an annotation on the left side\n"
 "indicating which revision, author and date introduced the change."
 msgstr ""
 
-#: breezy/builtins.py:5266
+#: breezy/builtins.py:5264
 msgid ""
 "If the origin is the same for a run of consecutive lines, it is\n"
 "shown only at the top, unless the --all option is given."
 msgstr ""
 
 # help of 'all' option of 'annotate' command
-#: breezy/builtins.py:5274
+#: breezy/builtins.py:5272
 msgid "Show annotations on all lines."
 msgstr ""
 
 # help of 'long' option of 'annotate' command
-#: breezy/builtins.py:5275
+#: breezy/builtins.py:5273
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: breezy/builtins.py:5352
+#: breezy/builtins.py:5350
 msgid "Cannot sign a range of non-revision-history revisions"
 msgstr ""
 
-#: breezy/builtins.py:5359
+#: breezy/builtins.py:5357
 msgid "Please supply either one revision, or a range."
 msgstr ""
 
-#: breezy/builtins.py:5363
+#: breezy/builtins.py:5361
 msgid ""
 "Convert the current branch into a checkout of the supplied branch.\n"
 "If no branch is supplied, rebind to the last bound location."
 msgstr ""
 
-#: breezy/builtins.py:5366
+#: breezy/builtins.py:5364
 msgid ""
 "Once converted into a checkout, commits must succeed on the master branch\n"
 "before they will be applied to the local branch."
 msgstr ""
 
-#: breezy/builtins.py:5369
+#: breezy/builtins.py:5367
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case binding will update the local nickname to be\n"
 "that of the master."
 msgstr ""
 
-#: breezy/builtins.py:5385
+#: breezy/builtins.py:5383
 msgid "No location supplied.  This format does not remember old locations."
 msgstr ""
 
-#: breezy/builtins.py:5391
+#: breezy/builtins.py:5389
 msgid "Branch is already bound"
 msgstr ""
 
-#: breezy/builtins.py:5394
+#: breezy/builtins.py:5392
 msgid "No location supplied and no previous location known"
 msgstr ""
 
-#: breezy/builtins.py:5401
+#: breezy/builtins.py:5399
 msgid "These branches have diverged. Try merging, and then bind again."
 msgstr ""
 
+#: breezy/builtins.py:5406
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
 #: breezy/builtins.py:5408
-msgid "Convert the current checkout into a regular branch."
-msgstr ""
-
-#: breezy/builtins.py:5410
 msgid ""
 "After unbinding, the local branch is considered independent and subsequent\n"
 "commits will be local only."
 msgstr ""
 
-#: breezy/builtins.py:5421
+#: breezy/builtins.py:5418
 msgid "Local branch is not bound"
 msgstr ""
 
-#: breezy/builtins.py:5425
+#: breezy/builtins.py:5422
 msgid "Remove the last committed revision."
 msgstr ""
 
-#: breezy/builtins.py:5427
+#: breezy/builtins.py:5424
 msgid ""
 "--verbose will print out what is being removed.\n"
 "--dry-run will go through all the motions, but not actually\n"
 "remove anything."
 msgstr ""
 
-#: breezy/builtins.py:5431
+#: breezy/builtins.py:5428
 msgid ""
 "If --revision is specified, uncommit revisions to leave the branch at the\n"
 "specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
 "branch at revision 15."
 msgstr ""
 
-#: breezy/builtins.py:5435
+#: breezy/builtins.py:5432
 msgid ""
 "Uncommit leaves the working tree ready for a new commit.  The only change\n"
 "it may make is to restore any pending merges that were present before\n"
@@ -3597,82 +3602,82 @@
 msgstr ""
 
 # help of 'dry-run' option of 'uncommit' command
-#: breezy/builtins.py:5446
+#: breezy/builtins.py:5443
 msgid "Don't actually make changes."
 msgstr ""
 
 # help of 'force' option of 'uncommit' command
-#: breezy/builtins.py:5447
+#: breezy/builtins.py:5444
 msgid "Say yes to all questions."
 msgstr ""
 
 # help of 'keep-tags' option of 'uncommit' command
-#: breezy/builtins.py:5449
+#: breezy/builtins.py:5446
 msgid "Keep tags that point to removed revisions."
 msgstr ""
 
 # help of 'local' option of 'uncommit' command
-#: breezy/builtins.py:5451
+#: breezy/builtins.py:5448
 msgid "Only remove the commits from the local branch when in a checkout."
 msgstr ""
 
-#: breezy/builtins.py:5500
+#: breezy/builtins.py:5496
 msgid "No revisions to uncommit.\n"
 msgstr ""
 
+#: breezy/builtins.py:5511
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
 #: breezy/builtins.py:5515
-msgid "Dry-run, pretending to remove the above revisions.\n"
+msgid "The above revision(s) will be removed.\n"
 msgstr ""
 
 #: breezy/builtins.py:5519
-msgid "The above revision(s) will be removed.\n"
-msgstr ""
-
-#: breezy/builtins.py:5523
 msgid "Uncommit these revisions"
 msgstr ""
 
-#: breezy/builtins.py:5526
+#: breezy/builtins.py:5522
 msgid "Canceled\n"
 msgstr ""
 
-#: breezy/builtins.py:5535
+#: breezy/builtins.py:5531
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  brz pull -d %s %s -r revid:%s\n"
 msgstr ""
 
-#: breezy/builtins.py:5540
+#: breezy/builtins.py:5536
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  brz pull . -r revid:%s\n"
 msgstr ""
 
-#: breezy/builtins.py:5546
+#: breezy/builtins.py:5542
 msgid "Break a dead lock."
 msgstr ""
 
-#: breezy/builtins.py:5548
+#: breezy/builtins.py:5544
 msgid ""
 "This command breaks a lock on a repository, branch, working directory or\n"
 "config file."
 msgstr ""
 
-#: breezy/builtins.py:5551
+#: breezy/builtins.py:5547
 msgid ""
 "CAUTION: Locks should only be broken when you are sure that the process\n"
 "holding the lock has been stopped."
 msgstr ""
 
-#: breezy/builtins.py:5554
+#: breezy/builtins.py:5550
 msgid ""
 "You can get information on what locks are open via the 'brz info\n"
 "[location]' command."
 msgstr ""
 
-#: breezy/builtins.py:5557
+#: breezy/builtins.py:5553
 msgid ""
 ":Examples:\n"
 "    brz break-lock\n"
@@ -3681,61 +3686,61 @@
 msgstr ""
 
 # help of 'config' option of 'break-lock' command
-#: breezy/builtins.py:5566
+#: breezy/builtins.py:5562
 msgid "LOCATION is the directory where the config lock is."
 msgstr ""
 
 # help of 'force' option of 'break-lock' command
-#: breezy/builtins.py:5568
+#: breezy/builtins.py:5564
 msgid "Do not ask for confirmation before breaking the lock."
 msgstr ""
 
 # help of 'protocol=git' option of 'serve' command
-#: breezy/builtins.py:5603
+#: breezy/builtins.py:5599
 msgid "Git Smart server protocol over TCP. (default port: 9418)"
 msgstr ""
 
 # help of 'protocol=git-receive-pack' option of 'serve' command
-#: breezy/builtins.py:5603
+#: breezy/builtins.py:5599
 msgid "Git Smart server receive pack command. (inetd mode only)"
 msgstr ""
 
 # help of 'protocol=git-upload-pack' option of 'serve' command
-#: breezy/builtins.py:5603
+#: breezy/builtins.py:5599
 msgid "Git Smart server upload pack command. (inetd mode only)"
 msgstr ""
 
 # help of 'protocol=bzr' option of 'serve' command
-#: breezy/builtins.py:5603
+#: breezy/builtins.py:5599
 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
 msgstr ""
 
-#: breezy/builtins.py:5604
+#: breezy/builtins.py:5600
 msgid "Run the brz server."
 msgstr ""