Breezy

Merge lp:~jelmer/brz/drop-irc into lp:brz

  1. drop-irc
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7927
Merged at revision: 7928
Proposed branch: lp:~jelmer/brz/drop-irc
Merge into: lp:brz
Diff against target: 84 lines (+8/-9)
3 files modified
README.rst (+1/-2)
doc/developers/HACKING.txt (+1/-1)
doc/developers/overview.txt (+6/-6)
To merge this branch: bzr merge lp:~jelmer/brz/drop-irc
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+460723@code.launchpad.net

Commit message

Drop IRC as communication channel, just reference Matrix

Description of the change

Drop IRC as communication channel, just reference Matrix

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (13.3 KiB)

The attempt to merge lp:~jelmer/brz/drop-irc into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

Collecting setuptools-gettext
  Downloading setuptools_gettext-0.1.11-py3-none-any.whl.metadata (1.9 kB)
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.11/site-packages (from setuptools-gettext) (68.1.2)
Downloading setuptools_gettext-0.1.11-py3-none-any.whl (13 kB)
Installing collected packages: setuptools-gettext
Successfully installed setuptools-gettext-0.1.11
Obtaining file:///tmp/tarmac/branch._swqoob1
  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'
  Installing backend dependencies: started
  Installing backend dependencies: 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.4.0.dev0) (5.0.8)
Requirement already satisfied: fastbencode in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2)
Requirement already satisfied: patiencediff in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.2.13)
Requirement already satisfied: merge3 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.0.8)
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (0.21.6)
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (1.26.18)
Requirement already satisfied: pyyaml in /usr/lib/python3/dist-packages (from breezy==3.4.0.dev0) (6.0.1)
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
  Downloading testtools-2.7.1-py3-none-any.whl.metadata (5.3 kB)
Collecting testscenarios (from breezy==3.4.0.dev0)
  Downloading testscenarios-0.5.0-py2.py3-none-any.whl (21 kB)
Collecting python-subunit (from breezy==3.4.0.dev0)
  Downloading python_subunit-1.4.4-py3-none-any.whl.metadata (22 kB)
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
  Using cached Cython-3.0.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (3.2 kB)
Requirement already satisfied: ruff in /usr/local/lib/python3.11/dist-packages (from breezy==3.4.0.dev0) (0.2.1)
Collecting docutils (from breezy==3.4.0.dev0)
  Downloading docutils-0.20.1-py3-none-any.whl.metadata (2.8 kB)
Requirement already satisfied: setuptools in ./lib/python3.11/site-packages (from breezy==3.4.0.dev0) (68.1.2)
Collecting sphinx (from breezy==3.4.0.dev0)
  Downloading sphinx-7.2.6-py3-none-any.whl.metadata (5.9 kB)
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
  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 fastimport (from breezy==3.4.0.dev0)
  Downloading fastimport-0.9.14.tar.gz (41 kB)
     ━━━━━━...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.rst'
--- README.rst 2022-09-07 14:53:55 +0000
+++ README.rst 2024-02-17 16:19:26 +0000
@@ -54,8 +54,7 @@
5454
55 Please mention that you are using Breezy rather than Bazaar.55 Please mention that you are using Breezy rather than Bazaar.
5656
57* Talk to us in irc://irc.oftc.net/breezy or57* Talk to us in `#breezy:matrix.org <https://matrix.to/#/#breezy:matrix.org>`_.
58 `#breezy:matrix.org <https://matrix.to/#/#breezy:matrix.org>`_.
5958
60Our mission is to make a version control tool that developers LOVE to use59Our mission is to make a version control tool that developers LOVE to use
61and that casual contributors feel confident with. Please let us know how60and that casual contributors feel confident with. Please let us know how
6261
=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt 2022-03-20 13:15:27 +0000
+++ doc/developers/HACKING.txt 2024-02-17 16:19:26 +0000
@@ -7,7 +7,7 @@
7also be useful to people developing Breezy plugins.7also be useful to people developing Breezy plugins.
88
9If you have any questions or something seems to be incorrect, unclear or9If you have any questions or something seems to be incorrect, unclear or
10missing, please talk to us in ``irc://irc.oftc.net/#breezy``, or write to10missing, please talk to us on matrix at ``#breezy:matrix.org``, or write to
11the Breezy mailing list. To propose a correction or addition to this11the Breezy mailing list. To propose a correction or addition to this
12document, send a merge request or new text to the mailing list.12document, send a merge request or new text to the mailing list.
1313
1414
=== modified file 'doc/developers/overview.txt'
--- doc/developers/overview.txt 2021-05-19 15:07:00 +0000
+++ doc/developers/overview.txt 2024-02-17 16:19:26 +0000
@@ -4,7 +4,7 @@
44
5This document describes the key classes and concepts within Breezy. It is5This document describes the key classes and concepts within Breezy. It is
6intended to be useful to people working on the Breezy codebase, or to6intended to be useful to people working on the Breezy codebase, or to
7people writing plugins. People writing plugins may also like to read the 7people writing plugins. People writing plugins may also like to read the
8guide to `Integrating with Breezy <integration.html>`_ for some specific recipes.8guide to `Integrating with Breezy <integration.html>`_ for some specific recipes.
99
10There's some overlap between this and the `Core Concepts`_ section of the10There's some overlap between this and the `Core Concepts`_ section of the
@@ -14,7 +14,7 @@
14like inventories, but this guide does.14like inventories, but this guide does.
1515
16If you have any questions, or if something seems to be incorrect, unclear16If you have any questions, or if something seems to be incorrect, unclear
17or missing, please talk to us in ``irc://irc.oftc.net/#breezy``, write to17or missing, please talk to us on Matrix in ``#breezy:matrix.org``, write to
18the Breezy mailing list, or simply file a bug report.18the Breezy mailing list, or simply file a bug report.
1919
2020
@@ -160,7 +160,7 @@
160160
161See also:161See also:
162162
163* `Developer guide to breezy transports <transports.html>`_ 163* `Developer guide to breezy transports <transports.html>`_
164* API docs for ``breezy.transport.Transport``164* API docs for ``breezy.transport.Transport``
165165
166Control directory166Control directory
@@ -207,7 +207,7 @@
207===========207===========
208208
209A workingtree is a special type of Tree that's associated with a working209A workingtree is a special type of Tree that's associated with a working
210directory on disk, where the user can directly modify the files. 210directory on disk, where the user can directly modify the files.
211211
212Responsibilities:212Responsibilities:
213213
@@ -229,7 +229,7 @@
229======229======
230230
231A Branch is a key user concept - its a single line of history that one or231A Branch is a key user concept - its a single line of history that one or
232more people have been committing to. 232more people have been committing to.
233233
234A Branch is responsible for:234A Branch is responsible for:
235235
@@ -254,7 +254,7 @@
254revision data that can be pointed to by various branches:254revision data that can be pointed to by various branches:
255255
256* Maintains storage of various history data at a URL:256* Maintains storage of various history data at a URL:
257 257
258 * Revisions (Must have a matching inventory)258 * Revisions (Must have a matching inventory)
259 * Digital Signatures259 * Digital Signatures
260 * Inventories for each Revision. (Must have all the file texts available).260 * Inventories for each Revision. (Must have all the file texts available).

Subscribers

People subscribed via source and target branches