From ff1b97d6c6746a76127c2753ebb6f571af45546e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 19 Mar 2025 16:18:27 +0100 Subject: [PATCH] Doc: Mention that Bazaar plugin also supports Breezy Change-Id: I2de3394f4f92696476e748c6974e338fb2d8c88c Reviewed-by: Eike Ziller --- .../src/vcs/creator-only/creator-vcs-bazaar.qdoc | 16 +++++++++------- .../src/vcs/creator-only/creator-vcs.qdoc | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc index 4932ab8e472..b638e7190b5 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc @@ -13,13 +13,15 @@ \ingroup creator-reference-vcs - \title Bazaar + \title Bazaar and Breezy - \brief Additional Bazaar functions. + \brief Additional Bazaar and Breezy functions. - Bazaar is a free version control system sponsored by Canonical. + Bazaar is a free version control system sponsored by Canonical. Breezy is a + fork of Bazaar that is backwards compatible with Bazaar's disk format and + protocols. However, Breezy runs on Python 3, rather than on Python 2. - \note Enable the Bazaar plugin to use it. + \note Enable the Bazaar plugin to use Bazaar or Breezy. In addition to the standard version control system functions described in \l {Use common VCS Functions}, you can select \uicontrol Tools > @@ -28,7 +30,7 @@ \section1 Uncommitting Revisions - In Bazaar, committing changes to a branch creates a new revision that holds + In Bazaar and Breezy, committing changes to a branch creates a new revision that holds a snapshot of the state of the working tree. To remove the last committed revision, select \uicontrol Tools > \uicontrol Bazaar > \uicontrol Uncommit. @@ -46,9 +48,9 @@ change it might make is restoring pending merges that were present before the commit. - \section1 Bazaar Preferences + \section1 Bazaar and Breezy Preferences - To set Bazaar preferences, select \preferences > + To set Bazaar or Breezy preferences, select \preferences > \uicontrol {Version Control} > \uicontrol Bazaar: \image qtcreator-preferences-vcs-bazaar.webp {Bazaar preferences} diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc index 98581711982..d1aa26792f5 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc @@ -29,9 +29,9 @@ \li Address \li Notes \row - \li \l{Bazaar} + \li \l{Bazaar and Breezy} \li \l{https://github.com/breezy-team/breezy} - \li Enable the plugin to use it. + \li Enable the plugin to use Bazaar or Breezy. \row \li \l{ClearCase} \li \l{http://www-01.ibm.com/software/awdtools/clearcase/} @@ -124,7 +124,7 @@ functions and options available for a particular version control system are described in separate topics. - \sa {Bazaar}, {ClearCase}, {CVS}, {Fossil}, {Git}, {GitLab}, {Mercurial}, + \sa {Bazaar and Breezy}, {ClearCase}, {CVS}, {Fossil}, {Git}, {GitLab}, {Mercurial}, {Perforce}, {Subversion} The \uicontrol{Version Control} view displays the commands that are