diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ $(PYFILESCMD) | xargs \ xgettext --package-name "Mercurial" \ --msgid-bugs-address "" \ - --copyright-holder "Matt Mackall and others" \ + --copyright-holder "Olivia Mackall and others" \ --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \ -d hg -p i18n -o hg.pot.tmp $(PYTHON) i18n/posplit i18n/hg.pot.tmp diff --git a/contrib/all-revsets.txt b/contrib/all-revsets.txt --- a/contrib/all-revsets.txt +++ b/contrib/all-revsets.txt @@ -46,8 +46,8 @@ # Used in revision c1546d7400ef min(0::) # Used in revision 546fa6576815 -author(lmoscovicz) or author(mpm) -author(mpm) or author(lmoscovicz) +author(lmoscovicz) or author(olivia) +author(olivia) or author(lmoscovicz) # Used in revision 9bfe68357c01 public() and id("d82e2223f132") # Used in revision ba89f7b542c9 @@ -100,7 +100,7 @@ draft() and ::tip ::tip and draft() author(lmoscovicz) -author(mpm) +author(olivia) ::p1(p1(tip)):: public() :10000 and public() @@ -130,7 +130,7 @@ head() head() - public() draft() and head() -head() and author("mpm") +head() and author("olivia") # testing the mutable phases set draft() diff --git a/contrib/base-revsets.txt b/contrib/base-revsets.txt --- a/contrib/base-revsets.txt +++ b/contrib/base-revsets.txt @@ -25,9 +25,9 @@ 0::tip roots(0::tip) author(lmoscovicz) -author(mpm) -author(lmoscovicz) or author(mpm) -author(mpm) or author(lmoscovicz) +author(olivia) +author(lmoscovicz) or author(olivia) +author(olivia) or author(lmoscovicz) tip:0 0:: # those two `roots(...)` inputs are close to what phase movement use. diff --git a/contrib/check-code.py b/contrib/check-code.py --- a/contrib/check-code.py +++ b/contrib/check-code.py @@ -2,7 +2,7 @@ # # check-code - a style and portability checker for Mercurial # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/contrib/check-commit b/contrib/check-commit --- a/contrib/check-commit +++ b/contrib/check-commit @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright 2014 Matt Mackall +# Copyright 2014 Olivia Mackall # # A tool/hook to run basic sanity checks on commits/patches for # submission to Mercurial. Install by adding the following to your diff --git a/contrib/check-config.py b/contrib/check-config.py --- a/contrib/check-config.py +++ b/contrib/check-config.py @@ -2,7 +2,7 @@ # # check-config - a config flag documentation checker for Mercurial # -# Copyright 2015 Matt Mackall +# Copyright 2015 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/contrib/hg-test-mode.el b/contrib/hg-test-mode.el --- a/contrib/hg-test-mode.el +++ b/contrib/hg-test-mode.el @@ -1,6 +1,6 @@ ;; hg-test-mode.el - Major mode for editing Mercurial tests ;; -;; Copyright 2014 Matt Mackall +;; Copyright 2014 Olivia Mackall ;; "I have no idea what I'm doing" ;; ;; This software may be used and distributed according to the terms of the diff --git a/contrib/hgperf b/contrib/hgperf --- a/contrib/hgperf +++ b/contrib/hgperf @@ -2,7 +2,7 @@ # # hgperf - measure performance of Mercurial commands # -# Copyright 2014 Matt Mackall +# Copyright 2014 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/contrib/logo-droplets.svg b/contrib/logo-droplets.svg --- a/contrib/logo-droplets.svg +++ b/contrib/logo-droplets.svg @@ -1,5 +1,5 @@ -image/svg+xmlMercurial "droplets" logoCali Mastny and Matt MackallFeb 12 2008 +image/svg+xmlMercurial "droplets" logoCali Mastny and Olivia MackallFeb 12 2008 diff --git a/contrib/memory.py b/contrib/memory.py --- a/contrib/memory.py +++ b/contrib/memory.py @@ -1,6 +1,6 @@ # memory.py - track memory usage # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/contrib/packaging/debian/copyright b/contrib/packaging/debian/copyright --- a/contrib/packaging/debian/copyright +++ b/contrib/packaging/debian/copyright @@ -3,7 +3,7 @@ Source: https://www.mercurial-scm.org/ Files: * -Copyright: 2005-2021, Matt Mackall and others. +Copyright: 2005-2021, Olivia Mackall and others. License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/contrib/packaging/inno/mercurial.iss b/contrib/packaging/inno/mercurial.iss --- a/contrib/packaging/inno/mercurial.iss +++ b/contrib/packaging/inno/mercurial.iss @@ -6,7 +6,7 @@ #endif [Setup] -AppCopyright=Copyright 2005-2021 Matt Mackall and others +AppCopyright=Copyright 2005-2021 Olivia Mackall and others AppName=Mercurial AppVersion={#VERSION} OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX} @@ -20,7 +20,7 @@ InfoAfterFile=../postinstall.txt LicenseFile=Copying.txt ShowLanguageDialog=yes -AppPublisher=Matt Mackall and others +AppPublisher=Olivia Mackall and others AppPublisherURL=https://mercurial-scm.org/ AppSupportURL=https://mercurial-scm.org/ AppUpdatesURL=https://mercurial-scm.org/ @@ -29,8 +29,8 @@ DefaultDirName={pf}\Mercurial SourceDir=stage VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) -VersionInfoCopyright=Copyright 2005-2021 Matt Mackall and others -VersionInfoCompany=Matt Mackall and others +VersionInfoCopyright=Copyright 2005-2021 Olivia Mackall and others +VersionInfoCompany=Olivia Mackall and others VersionInfoVersion={#QUAD_VERSION} InternalCompressLevel=max SolidCompression=true diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs --- a/contrib/packaging/wix/mercurial.wxs +++ b/contrib/packaging/wix/mercurial.wxs @@ -19,14 +19,14 @@ Name='Mercurial $(var.Version) ($(var.Platform))' UpgradeCode='$(var.ProductUpgradeCode)' Language='1033' Codepage='1252' Version='$(var.Version)' - Manufacturer='Matt Mackall and others'> + Manufacturer='Olivia Mackall and others'>

- Mercurial is Copyright 2005-2021 Matt Mackall and others. + Mercurial is Copyright 2005-2021 Olivia Mackall and others.

diff --git a/doc/runrst b/doc/runrst --- a/doc/runrst +++ b/doc/runrst @@ -2,7 +2,7 @@ # # runrst - register custom roles and run correct writer # -# Copyright 2010 Matt Mackall and others +# Copyright 2010 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hg b/hg --- a/hg +++ b/hg @@ -2,7 +2,7 @@ # # mercurial - scalable distributed SCM # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgdemandimport/demandimportpy2.py b/hgdemandimport/demandimportpy2.py --- a/hgdemandimport/demandimportpy2.py +++ b/hgdemandimport/demandimportpy2.py @@ -1,6 +1,6 @@ # demandimport.py - global demand-loading of modules for Mercurial # -# Copyright 2006, 2007 Matt Mackall +# Copyright 2006, 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -1,6 +1,6 @@ # convert.py Foreign SCM converter # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/common.py b/hgext/convert/common.py --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -1,6 +1,6 @@ # common.py - common code for the convert extension # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -1,6 +1,6 @@ # convcmd - convert extension commands definition # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -1,6 +1,6 @@ # cvs.py: CVS conversion code inspired by hg-cvs-import and git-cvsimport # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -1,6 +1,6 @@ # darcs.py - darcs support for the convert extension # -# Copyright 2007-2009 Matt Mackall and others +# Copyright 2007-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -1,6 +1,6 @@ # git.py - git support for the convert extension # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -1,6 +1,6 @@ # hg.py - hg backend for convert extension # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -1,6 +1,6 @@ # patchbomb.py - sending Mercurial changesets as patch emails # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/share.py b/hgext/share.py --- a/hgext/share.py +++ b/hgext/share.py @@ -1,4 +1,4 @@ -# Copyright 2006, 2007 Matt Mackall +# Copyright 2006, 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/win32text.py b/hgext/win32text.py --- a/hgext/win32text.py +++ b/hgext/win32text.py @@ -1,6 +1,6 @@ # win32text.py - LF <-> CRLF/CR translation utilities for Windows/Mac users # -# Copyright 2005, 2007-2009 Matt Mackall and others +# Copyright 2005, 2007-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -1,6 +1,6 @@ # zeroconf.py - zeroconf support for Mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -1,6 +1,6 @@ # Danish translations for Mercurial # Danske oversættelser for Mercurial -# Copyright (C) 2009, 2010 Matt Mackall and others +# Copyright (C) 2009, 2010 Olivia Mackall and others # # Translation dictionary: # @@ -11359,11 +11359,11 @@ msgstr "(se http://mercurial.selenic.com for mere information)" msgid "" -"Copyright (C) 2005-2011 Matt Mackall and others\n" +"Copyright (C) 2005-2011 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2011 Matt Mackall og andre\n" +"Copyright (C) 2005-2011 Olivia Mackall og andre\n" "Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n" "gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n" "NOGET BESTEMT FORMÅL.\n" diff --git a/i18n/de.po b/i18n/de.po --- a/i18n/de.po +++ b/i18n/de.po @@ -1,6 +1,6 @@ # German translations for Mercurial # Deutsche Übersetzungen für Mercurial -# Copyright (C) 2009 Matt Mackall and others +# Copyright (C) 2009 Olivia Mackall and others # # Übersetzer: # Tobias Bell @@ -14536,11 +14536,11 @@ msgstr "(siehe http://mercurial.selenic.com für mehr Information)" msgid "" -"Copyright (C) 2005-2014 Matt Mackall and others\n" +"Copyright (C) 2005-2014 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2014 Matt Mackall und andere\n" +"Copyright (C) 2005-2014 Olivia Mackall und andere\n" "Dies ist freie Software; siehe Quellen für Kopierbestimmungen. Es besteht\n" "KEINE Gewährleistung für das Programm, nicht einmal der Marktreife oder der\n" "Verwendbarkeit für einen bestimmten Zweck.\n" @@ -18893,7 +18893,7 @@ msgstr "" msgid "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" @@ -19032,7 +19032,7 @@ msgid "" "Author\n" "\"\"\"\"\"\"\n" -"Written by Matt Mackall " +"Written by Olivia Mackall " msgstr "" msgid "" @@ -19050,7 +19050,7 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2014 Matt Mackall.\n" +"Copyright (C) 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" @@ -19088,7 +19088,7 @@ "Vadim Gelfer " msgstr "" -msgid "Mercurial was written by Matt Mackall ." +msgid "Mercurial was written by Olivia Mackall ." msgstr "" msgid "" @@ -19101,7 +19101,7 @@ "Copying\n" "=======\n" "This manual page is copyright 2006 Vadim Gelfer.\n" -"Mercurial is copyright 2005-2014 Matt Mackall.\n" +"Mercurial is copyright 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" @@ -19307,7 +19307,7 @@ "Copying\n" "=======\n" "This manual page is copyright 2005 Bryan O'Sullivan.\n" -"Mercurial is copyright 2005-2014 Matt Mackall.\n" +"Mercurial is copyright 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" diff --git a/i18n/el.po b/i18n/el.po --- a/i18n/el.po +++ b/i18n/el.po @@ -1,7 +1,7 @@ # Greek translations for Mercurial # Ελληνική μετάφραση των μηνυμάτων του Mercurial # -# Copyright (C) 2009 Matt Mackall και άλλοι +# Copyright (C) 2009 Olivia Mackall και άλλοι # msgid "" msgstr "" @@ -7606,12 +7606,12 @@ msgid "" "\n" -"Copyright (C) 2005-2010 Matt Mackall and others\n" +"Copyright (C) 2005-2010 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "\n" -"Πνευματικά δικαιώματα (C) 2005-2009 Matt Mackall και άλλοι\n" +"Πνευματικά δικαιώματα (C) 2005-2009 Olivia Mackall και άλλοι\n" "Αυτό το πρόγραμμα είναι ελεύθερο λογισμικό· δείτε τον πηγαίο κώδικα για\n" "την άδεια χρήσης του. Δεν παρέχεται ΚΑΜΙΑ εγγύηση· ούτε καν για την\n" "ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑ ή την ΚΑΤΑΛΛΗΛΟΤΗΤΑ ΓΙΑ ΚΑΠΟΙΟ ΣΚΟΠΟ.\n" diff --git a/i18n/fr.po b/i18n/fr.po --- a/i18n/fr.po +++ b/i18n/fr.po @@ -1,6 +1,6 @@ # French translations for Mercurial # Traductions françaises de Mercurial -# Copyright (C) 2009 Matt Mackall and others +# Copyright (C) 2009 Olivia Mackall and others # # Quelques règles : # - dans l'aide d'une commande, la première ligne descriptive @@ -9412,7 +9412,7 @@ msgid "" "\n" -"Copyright (C) 2005-2010 Matt Mackall and others\n" +"Copyright (C) 2005-2010 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" diff --git a/i18n/hggettext b/i18n/hggettext --- a/i18n/hggettext +++ b/i18n/hggettext @@ -2,7 +2,7 @@ # # hggettext - carefully extract docstrings for Mercurial # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/i18n/it.po b/i18n/it.po --- a/i18n/it.po +++ b/i18n/it.po @@ -1,6 +1,6 @@ # Italian translations for Mercurial # Traduzione italiana per Mercurial -# Copyright (C) 2009 Matt Mackall and others +# Copyright (C) 2009 Olivia Mackall and others msgid "" msgstr "" "Project-Id-Version: Mercurial\n" @@ -8881,11 +8881,11 @@ msgstr "" msgid "" -"Copyright (C) 2005-2011 Matt Mackall and others\n" +"Copyright (C) 2005-2011 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2011 Matt Mackall e altri\n" +"Copyright (C) 2005-2011 Olivia Mackall e altri\n" "Questo è software libero; vedere i sorgenti per le condizioni di copia.\n" "Non c'è ALCUNA garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n" "SCOPO PARTICOLARE.\n" diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -18771,11 +18771,11 @@ msgstr "(詳細は https://mercurial-scm.org を参照)" msgid "" -"Copyright (C) 2005-2018 Matt Mackall and others\n" +"Copyright (C) 2005-2018 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2018 Matt Mackall and others\n" +"Copyright (C) 2005-2018 Olivia Mackall and others\n" "本製品はフリーソフトウェアです。\n" "頒布条件に関しては同梱されるライセンス条項をお読みください。\n" "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n" @@ -30239,11 +30239,11 @@ msgid "" "Author\n" "\"\"\"\"\"\"\n" -"Written by Matt Mackall " +"Written by Olivia Mackall " msgstr "" "著者\n" "\"\"\"\"\n" -"Matt Mackall " +"Olivia Mackall " msgid "" "Resources\n" @@ -30264,13 +30264,13 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2016 Matt Mackall.\n" +"Copyright (C) 2005-2016 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2016 Matt Mackall.\n" +"Copyright (C) 2005-2016 Olivia Mackall.\n" "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" "Public License の元での自由な利用が保証されています。" @@ -30293,12 +30293,12 @@ "----------------------------------" msgid "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" msgstr "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" @@ -30471,13 +30471,13 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2018 Matt Mackall.\n" +"Copyright (C) 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2016 Matt Mackall.\n" +"Copyright (C) 2005-2016 Olivia Mackall.\n" "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" "Public License の元での自由な利用が保証されています。" @@ -30519,8 +30519,8 @@ "====\n" "本マニュアルページの著者は Vadim Gelfer です。" -msgid "Mercurial was written by Matt Mackall ." -msgstr "Mercurial の著者は Matt Mackall です。" +msgid "Mercurial was written by Olivia Mackall ." +msgstr "Mercurial の著者は Olivia Mackall です。" msgid "" "See Also\n" @@ -30536,14 +30536,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2006 Vadim Gelfer.\n" -"Mercurial is copyright 2005-2018 Matt Mackall.\n" +"Mercurial is copyright 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルページの著作権は copyright 2006 Vadim Gelfer です。\n" -"Mercurial の著作権は copyright 2005-2017 Matt Mackall です。\n" +"Mercurial の著作権は copyright 2005-2017 Olivia Mackall です。\n" "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" "Public License の元での自由な利用が保証されています。" @@ -30825,14 +30825,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2005 Bryan O'Sullivan.\n" -"Mercurial is copyright 2005-2018 Matt Mackall.\n" +"Mercurial is copyright 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルの著作権は copyright 2005 Bryan O'Sullivan です。\n" -"Mercurial の著作権は copyright 2005-2017 Matt Mackall です。\n" +"Mercurial の著作権は copyright 2005-2017 Olivia Mackall です。\n" "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" "Public License の元での自由な利用が保証されています。" @@ -39790,13 +39790,13 @@ #~ msgid "" #~ "Copying\n" #~ "\"\"\"\"\"\"\"\n" -#~ "Copyright (C) 2005-2017 Matt Mackall.\n" +#~ "Copyright (C) 2005-2017 Olivia Mackall.\n" #~ "Free use of this software is granted under the terms of the GNU General\n" #~ "Public License version 2 or any later version." #~ msgstr "" #~ "Copying\n" #~ "\"\"\"\"\"\"\"\n" -#~ "Copyright (C) 2005-2017 Matt Mackall.\n" +#~ "Copyright (C) 2005-2017 Olivia Mackall.\n" #~ "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" #~ "Public License の元での自由な利用が保証されています。" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -1,6 +1,6 @@ # Brazilian Portuguese translations for Mercurial # Traduções do Mercurial para português do Brasil -# Copyright (C) 2011 Matt Mackall and others +# Copyright (C) 2011 Olivia Mackall and others # # Translators: # Diego Oliveira @@ -19269,11 +19269,11 @@ msgstr "(veja https://mercurial-scm.org para mais informações)" msgid "" -"Copyright (C) 2005-2018 Matt Mackall and others\n" +"Copyright (C) 2005-2018 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2018 Matt Mackall e outros\n" +"Copyright (C) 2005-2018 Olivia Mackall e outros\n" "Este software é livre; veja os fontes para condições de cópia. Não\n" "há garantias, nem mesmo de adequação para qualquer propósito em\n" "particular.\n" @@ -31340,11 +31340,11 @@ msgid "" "Author\n" "\"\"\"\"\"\"\n" -"Written by Matt Mackall " +"Written by Olivia Mackall " msgstr "" "Autor\n" "\"\"\"\"\"\n" -"Escrito por Matt Mackall " +"Escrito por Olivia Mackall " msgid "" "Resources\n" @@ -31367,13 +31367,13 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2016 Matt Mackall.\n" +"Copyright (C) 2005-2016 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Cópia\n" "\"\"\"\"\"\n" -"Copyright (C) 2005-2016 Matt Mackall.\n" +"Copyright (C) 2005-2016 Olivia Mackall.\n" "Garante-se livre uso deste software nos termos da licença\n" "GNU General Public License, versão 2 ou qualquer versão posterior." @@ -31396,12 +31396,12 @@ "----------------------------------------------------" msgid "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" msgstr "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" @@ -31581,13 +31581,13 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2018 Matt Mackall.\n" +"Copyright (C) 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Cópia\n" "\"\"\"\"\"\n" -"Copyright (C) 2005-2018 Matt Mackall.\n" +"Copyright (C) 2005-2018 Olivia Mackall.\n" "Garante-se livre uso deste software nos termos da licença\n" "GNU General Public License, versão 2 ou qualquer versão posterior." @@ -31629,8 +31629,8 @@ "=====\n" "Vadim Gelfer " -msgid "Mercurial was written by Matt Mackall ." -msgstr "Mercurial foi escrito por Matt Mackall ." +msgid "Mercurial was written by Olivia Mackall ." +msgstr "Mercurial foi escrito por Olivia Mackall ." msgid "" "See Also\n" @@ -31645,14 +31645,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2006 Vadim Gelfer.\n" -"Mercurial is copyright 2005-2018 Matt Mackall.\n" +"Mercurial is copyright 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Cópia\n" "=====\n" "Esta página de manual: copyright 2006 Vadim Gelfer.\n" -"Mercurial: copyright 2005-2018 Matt Mackall.\n" +"Mercurial: copyright 2005-2018 Olivia Mackall.\n" "Garante-se livre uso deste software nos termos da licença\n" "GNU General Public License, versão 2 ou qualquer versão posterior." @@ -31928,14 +31928,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2005 Bryan O'Sullivan.\n" -"Mercurial is copyright 2005-2018 Matt Mackall.\n" +"Mercurial is copyright 2005-2018 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Cópia\n" "=====\n" "Esta página de manual: copyright 2005 Bryan O'Sullivan.\n" -"Mercurial: copyright 2005-2018 Matt Mackall.\n" +"Mercurial: copyright 2005-2018 Olivia Mackall.\n" "Garante-se livre uso deste software nos termos da licença\n" "GNU General Public License, versão 2 ou qualquer versão posterior." @@ -41308,13 +41308,13 @@ #~ msgid "" #~ "Copying\n" #~ "\"\"\"\"\"\"\"\n" -#~ "Copyright (C) 2005-2017 Matt Mackall.\n" +#~ "Copyright (C) 2005-2017 Olivia Mackall.\n" #~ "Free use of this software is granted under the terms of the GNU General\n" #~ "Public License version 2 or any later version." #~ msgstr "" #~ "Cópia\n" #~ "\"\"\"\"\"\n" -#~ "Copyright (C) 2005-2017 Matt Mackall.\n" +#~ "Copyright (C) 2005-2017 Olivia Mackall.\n" #~ "Garante-se livre uso deste software nos termos da licença\n" #~ "GNU General Public License, versão 2 ou qualquer versão posterior." diff --git a/i18n/ro.po b/i18n/ro.po --- a/i18n/ro.po +++ b/i18n/ro.po @@ -1,7 +1,7 @@ # Romanian translation for Mercurial # Traducerea în limba română pentru Mercurial # -# Copyright (C) 2010 Matt Mackall and others +# Copyright (C) 2010 Olivia Mackall and others # # # Glosar de traduceri @@ -10032,11 +10032,11 @@ msgstr "(vezi http://mercurial.selenic.com pentru mai multe informații)" msgid "" -"Copyright (C) 2005-2011 Matt Mackall and others\n" +"Copyright (C) 2005-2011 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2011 Matt Mackall și alții\n" +"Copyright (C) 2005-2011 Olivia Mackall și alții\n" "Acesta este software liber; vezi sursa pentru condițiile de copiere.\n" "Nu există NICIO garanție; nici măcar pentru COMERCIALIZARE sau\n" "COMPATIBILITATE ÎN ANUMITE SCOPURI.\n" diff --git a/i18n/ru.po b/i18n/ru.po --- a/i18n/ru.po +++ b/i18n/ru.po @@ -1,5 +1,5 @@ # Russian translations for Mercurial package. -# Copyright (C) 2011 Matt Mackall and others +# Copyright (C) 2011 Olivia Mackall and others # This file is distributed under the same license as the Mercurial package. # === Glossary === # @@ -15590,11 +15590,11 @@ msgstr "(подробнее см. http://mercurial.selenic.com)" msgid "" -"Copyright (C) 2005-2014 Matt Mackall and others\n" +"Copyright (C) 2005-2014 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"(С) 2005-2014 Matt Mackall и другие.\n" +"(С) 2005-2014 Olivia Mackall и другие.\n" "Это свободное ПО; условия распространения см. в исходном коде.\n" "НИКАКИХ ГАРАНТИЙ НЕ ПРЕДОСТАВЛЯЕТСЯ, в том числе на пригодность для\n" "коммерческого использования и для решения конкретных задач.\n" @@ -21807,7 +21807,7 @@ # NOT SURE should this be translated? msgid "" -":Author: Matt Mackall \n" +":Author: Olivia Mackall \n" ":Organization: Mercurial\n" ":Manual section: 1\n" ":Manual group: Mercurial Manual" @@ -22000,11 +22000,11 @@ msgid "" "Author\n" "\"\"\"\"\"\"\n" -"Written by Matt Mackall " +"Written by Olivia Mackall " msgstr "" "Автор\n" "\"\"\"\"\"\n" -"Matt Mackall " +"Olivia Mackall " msgid "" "Resources\n" @@ -22024,13 +22024,13 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2014 Matt Mackall.\n" +"Copyright (C) 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Копирование\n" "\"\"\"\"\"\"\"\"\"\"\"\n" -"(C) 2005-2014 Matt Mackall.\n" +"(C) 2005-2014 Olivia Mackall.\n" "Свободное использование этого ПО возможно в соответствии с \n" "Универсальной Общественной Лицензией GNU (GNU GPL) версии 2 или выше." @@ -22068,8 +22068,8 @@ "=====\n" "Vadim Gelfer " -msgid "Mercurial was written by Matt Mackall ." -msgstr "Mercurial написан Matt Mackall ." +msgid "Mercurial was written by Olivia Mackall ." +msgstr "Mercurial написан Olivia Mackall ." msgid "" "See Also\n" @@ -22084,14 +22084,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2006 Vadim Gelfer.\n" -"Mercurial is copyright 2005-2014 Matt Mackall.\n" +"Mercurial is copyright 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Копирование\n" "===========\n" "Правами на данную страницу обладает (с) 2006 Vadim Gelfer\n" -"Права на Mercurial принадлежат (с) 2005-2014 Matt Mackall.\n" +"Права на Mercurial принадлежат (с) 2005-2014 Olivia Mackall.\n" "Свободное использование этого ПО возможно в соответствии с \n" "Универсальной Общественной Лицензией GNU (GNU GPL) версии 2 или выше." @@ -22346,14 +22346,14 @@ "Copying\n" "=======\n" "This manual page is copyright 2005 Bryan O'Sullivan.\n" -"Mercurial is copyright 2005-2014 Matt Mackall.\n" +"Mercurial is copyright 2005-2014 Olivia Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Копирование\n" "===========\n" "Правами на данную страницу обладает (с) 2005 Bryan O'Sullivan\n" -"Права на Mercurial принадлежат (с) 2005-2014 Matt Mackall.\n" +"Права на Mercurial принадлежат (с) 2005-2014 Olivia Mackall.\n" "Свободное использование этого ПО возможно в соответствии с \n" "Универсальной Общественной Лицензией GNU (GNU GPL) версии 2 или выше." diff --git a/i18n/sv.po b/i18n/sv.po --- a/i18n/sv.po +++ b/i18n/sv.po @@ -1,6 +1,6 @@ # Swedish translation for Mercurial # Svensk översättning för Mercurial -# Copyright (C) 2009-2012 Matt Mackall and others +# Copyright (C) 2009-2012 Olivia Mackall and others # # Translation dictionary: # @@ -12413,11 +12413,11 @@ msgstr "(se http://mercurial.selenic.com för mer information)" msgid "" -"Copyright (C) 2005-2012 Matt Mackall and others\n" +"Copyright (C) 2005-2012 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2012 Matt Mackall och andra\n" +"Copyright (C) 2005-2012 Olivia Mackall och andra\n" "Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n" "garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -7409,12 +7409,12 @@ msgid "" "\n" -"Copyright (C) 2005-2010 Matt Mackall and others\n" +"Copyright (C) 2005-2010 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "\n" -"版权所有 (C) 2005-2010 Matt Mackall 和其他人。\n" +"版权所有 (C) 2005-2010 Olivia Mackall 和其他人。\n" "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n" "特定目的的隐含的担保。\n" diff --git a/i18n/zh_TW.po b/i18n/zh_TW.po --- a/i18n/zh_TW.po +++ b/i18n/zh_TW.po @@ -1,5 +1,5 @@ # Traditional Chinese translation for Mercurial -# Copyright (C) 2009 Matt Mackall and others +# Copyright (C) 2009 Olivia Mackall and others # This file is distributed under the same license as the Mercurial package. # Chia-Huan Wu , 2009. # @@ -8191,7 +8191,7 @@ msgstr "\tSee 'hg help urls' for more information." msgid "" -"Copyright (C) 2005-2010 Matt Mackall and others\n" +"Copyright (C) 2005-2010 Olivia Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" diff --git a/mercurial/ancestor.py b/mercurial/ancestor.py --- a/mercurial/ancestor.py +++ b/mercurial/ancestor.py @@ -1,6 +1,6 @@ # ancestor.py - generic DAG ancestor algorithm for mercurial # -# Copyright 2006 Matt Mackall +# Copyright 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/bdiff.c b/mercurial/bdiff.c --- a/mercurial/bdiff.c +++ b/mercurial/bdiff.c @@ -1,7 +1,7 @@ /* bdiff.c - efficient binary diff extension for Mercurial - Copyright 2005, 2006 Matt Mackall + Copyright 2005, 2006 Olivia Mackall This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -1,6 +1,6 @@ # branchmap.py - logic to computes, maintain and stores branchmap for local repo # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/cacheutil.py b/mercurial/cacheutil.py --- a/mercurial/cacheutil.py +++ b/mercurial/cacheutil.py @@ -1,6 +1,6 @@ # scmutil.py - Mercurial core utility functions # -# Copyright Matt Mackall and other +# Copyright Olivia Mackall and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/cext/bdiff.c b/mercurial/cext/bdiff.c --- a/mercurial/cext/bdiff.c +++ b/mercurial/cext/bdiff.c @@ -1,7 +1,7 @@ /* bdiff.c - efficient binary diff extension for Mercurial - Copyright 2005, 2006 Matt Mackall + Copyright 2005, 2006 Olivia Mackall This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/cext/charencode.c b/mercurial/cext/charencode.c --- a/mercurial/cext/charencode.c +++ b/mercurial/cext/charencode.c @@ -1,7 +1,7 @@ /* charencode.c - miscellaneous character encoding - Copyright 2008 Matt Mackall and others + Copyright 2008 Olivia Mackall and others This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/cext/mpatch.c b/mercurial/cext/mpatch.c --- a/mercurial/cext/mpatch.c +++ b/mercurial/cext/mpatch.c @@ -14,7 +14,7 @@ allocation of intermediate Python objects. Working memory is about 2x the total number of hunks. - Copyright 2005, 2006 Matt Mackall + Copyright 2005, 2006 Olivia Mackall This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/cext/osutil.c b/mercurial/cext/osutil.c --- a/mercurial/cext/osutil.c +++ b/mercurial/cext/osutil.c @@ -1,7 +1,7 @@ /* osutil.c - native operating system services - Copyright 2007 Matt Mackall and others + Copyright 2007 Olivia Mackall and others This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c --- a/mercurial/cext/parsers.c +++ b/mercurial/cext/parsers.c @@ -1,7 +1,7 @@ /* parsers.c - efficient content parsing - Copyright 2008 Matt Mackall and others + Copyright 2008 Olivia Mackall and others This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c --- a/mercurial/cext/revlog.c +++ b/mercurial/cext/revlog.c @@ -1,7 +1,7 @@ /* parsers.c - efficient content parsing - Copyright 2008 Matt Mackall and others + Copyright 2008 Olivia Mackall and others This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -1,6 +1,6 @@ # changegroup.py - Mercurial changegroup manipulation functions # -# Copyright 2006 Matt Mackall +# Copyright 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -1,6 +1,6 @@ # changelog.py - changelog class for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1,6 +1,6 @@ # cmdutil.py - help for command processing in mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1,6 +1,6 @@ # commands.py - command processing for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. @@ -7708,7 +7708,7 @@ ) license = _( b"(see https://mercurial-scm.org for more information)\n" - b"\nCopyright (C) 2005-2021 Matt Mackall and others\n" + b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n" b"This is free software; see the source for copying conditions. " b"There is NO\nwarranty; " b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py --- a/mercurial/commandserver.py +++ b/mercurial/commandserver.py @@ -1,6 +1,6 @@ # commandserver.py - communicate with Mercurial's API over a pipe # -# Copyright Matt Mackall +# Copyright Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/config.py b/mercurial/config.py --- a/mercurial/config.py +++ b/mercurial/config.py @@ -1,6 +1,6 @@ # config.py - configuration parsing for Mercurial # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1,6 +1,6 @@ # context.py - changeset and file context objects for mercurial # -# Copyright 2006, 2007 Matt Mackall +# Copyright 2006, 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -1,7 +1,7 @@ # coding: utf8 # copies.py - copy detection for Mercurial # -# Copyright 2008 Matt Mackall +# Copyright 2008 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -1,6 +1,6 @@ # dagop.py - graph ancestry and topology algorithm for revset # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1,6 +1,6 @@ # debugcommands.py - command processing for debug* commands # -# Copyright 2005-2016 Matt Mackall +# Copyright 2005-2016 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/destutil.py b/mercurial/destutil.py --- a/mercurial/destutil.py +++ b/mercurial/destutil.py @@ -1,6 +1,6 @@ # destutil.py - Mercurial utility function for command destination # -# Copyright Matt Mackall and other +# Copyright Olivia Mackall and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/diffhelper.py b/mercurial/diffhelper.py --- a/mercurial/diffhelper.py +++ b/mercurial/diffhelper.py @@ -1,6 +1,6 @@ # diffhelper.py - helper routines for patch # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -1,6 +1,6 @@ # dirstate.py - working directory tracking for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/dirstateguard.py b/mercurial/dirstateguard.py --- a/mercurial/dirstateguard.py +++ b/mercurial/dirstateguard.py @@ -1,6 +1,6 @@ # dirstateguard.py - class to allow restoring dirstate after failure # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -1,6 +1,6 @@ # discovery.py - protocol changeset discovery functions # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -1,6 +1,6 @@ # dispatch.py - command dispatching for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/encoding.py b/mercurial/encoding.py --- a/mercurial/encoding.py +++ b/mercurial/encoding.py @@ -1,6 +1,6 @@ # encoding.py - character transcoding support for Mercurial # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/error.py b/mercurial/error.py --- a/mercurial/error.py +++ b/mercurial/error.py @@ -1,6 +1,6 @@ # error.py - Mercurial exceptions # -# Copyright 2005-2008 Matt Mackall +# Copyright 2005-2008 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1,6 +1,6 @@ # exchange.py - utility to exchange data between repos. # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -1,6 +1,6 @@ # extensions.py - extension handling for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/fancyopts.py b/mercurial/fancyopts.py --- a/mercurial/fancyopts.py +++ b/mercurial/fancyopts.py @@ -1,6 +1,6 @@ # fancyopts.py - better command line parsing # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -1,6 +1,6 @@ # filelog.py - file history class for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -1,6 +1,6 @@ # filemerge.py - file-level merge handling for Mercurial # -# Copyright 2006, 2007, 2008 Matt Mackall +# Copyright 2006, 2007, 2008 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/fileset.py b/mercurial/fileset.py --- a/mercurial/fileset.py +++ b/mercurial/fileset.py @@ -1,6 +1,6 @@ # fileset.py - file set queries for mercurial # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/filesetlang.py b/mercurial/filesetlang.py --- a/mercurial/filesetlang.py +++ b/mercurial/filesetlang.py @@ -1,6 +1,6 @@ # filesetlang.py - parser, tokenizer and utility for file set language # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/formatter.py b/mercurial/formatter.py --- a/mercurial/formatter.py +++ b/mercurial/formatter.py @@ -1,6 +1,6 @@ # formatter.py - generic output formatting for mercurial # -# Copyright 2012 Matt Mackall +# Copyright 2012 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/grep.py b/mercurial/grep.py --- a/mercurial/grep.py +++ b/mercurial/grep.py @@ -1,6 +1,6 @@ # grep.py - logic for history walk and grep # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py --- a/mercurial/hbisect.py +++ b/mercurial/hbisect.py @@ -1,6 +1,6 @@ # changelog bisection for mercurial # -# Copyright 2007 Matt Mackall +# Copyright 2007 Olivia Mackall # Copyright 2005, 2006 Benoit Boissinot # # Inspired by git bisect, extension skeleton taken from mq.py. diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -1,6 +1,6 @@ # help.py - help data for mercurial # -# Copyright 2006 Matt Mackall +# Copyright 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hg-ssh.8.txt b/mercurial/helptext/hg-ssh.8.txt --- a/mercurial/helptext/hg-ssh.8.txt +++ b/mercurial/helptext/hg-ssh.8.txt @@ -52,7 +52,7 @@ Author """""" -Written by Matt Mackall +Written by Olivia Mackall Resources """"""""" @@ -64,7 +64,7 @@ Copying """"""" -Copyright (C) 2005-2016 Matt Mackall. +Copyright (C) 2005-2016 Olivia Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hg.1.txt b/mercurial/helptext/hg.1.txt --- a/mercurial/helptext/hg.1.txt +++ b/mercurial/helptext/hg.1.txt @@ -6,7 +6,7 @@ Mercurial source code management system --------------------------------------- -:Author: Matt Mackall +:Author: Olivia Mackall :Organization: Mercurial :Manual section: 1 :Manual group: Mercurial Manual @@ -100,7 +100,7 @@ Author """""" -Written by Matt Mackall +Written by Olivia Mackall Resources """"""""" @@ -112,7 +112,7 @@ Copying """"""" -Copyright (C) 2005-2021 Matt Mackall. +Copyright (C) 2005-2021 Olivia Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hgignore.5.txt b/mercurial/helptext/hgignore.5.txt --- a/mercurial/helptext/hgignore.5.txt +++ b/mercurial/helptext/hgignore.5.txt @@ -17,7 +17,7 @@ ====== Vadim Gelfer -Mercurial was written by Matt Mackall . +Mercurial was written by Olivia Mackall . See Also ======== @@ -26,7 +26,7 @@ Copying ======= This manual page is copyright 2006 Vadim Gelfer. -Mercurial is copyright 2005-2021 Matt Mackall. +Mercurial is copyright 2005-2021 Olivia Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/helptext/hgrc.5.txt b/mercurial/helptext/hgrc.5.txt --- a/mercurial/helptext/hgrc.5.txt +++ b/mercurial/helptext/hgrc.5.txt @@ -25,7 +25,7 @@ ====== Bryan O'Sullivan . -Mercurial was written by Matt Mackall . +Mercurial was written by Olivia Mackall . See Also ======== @@ -34,7 +34,7 @@ Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. -Mercurial is copyright 2005-2021 Matt Mackall. +Mercurial is copyright 2005-2021 Olivia Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1,6 +1,6 @@ # hg.py - repository classes for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py +++ b/mercurial/hgweb/__init__.py @@ -1,7 +1,7 @@ # hgweb/__init__.py - web interface to a mercurial repository # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005 Matt Mackall +# Copyright 2005 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py +++ b/mercurial/hgweb/common.py @@ -1,7 +1,7 @@ # hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -1,7 +1,7 @@ # hgweb/hgweb_mod.py - Web interface for a repository. # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -1,7 +1,7 @@ # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories. # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -1,7 +1,7 @@ # hgweb/request.py - An http request from either CGI or the standalone server. # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -1,7 +1,7 @@ # hgweb/server.py - The standalone hg web server. # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -1,6 +1,6 @@ # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -1,7 +1,7 @@ # hgweb/webutil.py - utility library for the web interface. # # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/hook.py b/mercurial/hook.py --- a/mercurial/hook.py +++ b/mercurial/hook.py @@ -1,6 +1,6 @@ # hook.py - hook support for mercurial # -# Copyright 2007 Matt Mackall +# Copyright 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/httpconnection.py b/mercurial/httpconnection.py --- a/mercurial/httpconnection.py +++ b/mercurial/httpconnection.py @@ -1,6 +1,6 @@ # httpconnection.py - urllib2 handler for new http support # -# Copyright 2005, 2006, 2007, 2008 Matt Mackall +# Copyright 2005, 2006, 2007, 2008 Olivia Mackall # Copyright 2006, 2007 Alexis S. L. Carvalho # Copyright 2006 Vadim Gelfer # Copyright 2011 Google, Inc. diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py --- a/mercurial/httppeer.py +++ b/mercurial/httppeer.py @@ -1,6 +1,6 @@ # httppeer.py - HTTP repository proxy classes for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/i18n.py b/mercurial/i18n.py --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -1,6 +1,6 @@ # i18n.py - internationalization support for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1,6 +1,6 @@ # localrepo.py - read/write repository class for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/lock.py b/mercurial/lock.py --- a/mercurial/lock.py +++ b/mercurial/lock.py @@ -1,6 +1,6 @@ # lock.py - simple advisory locking scheme for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py --- a/mercurial/logcmdutil.py +++ b/mercurial/logcmdutil.py @@ -1,6 +1,6 @@ # logcmdutil.py - utility for log-like commands # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -1,6 +1,6 @@ # mail.py - mail sending bits for mercurial # -# Copyright 2006 Matt Mackall +# Copyright 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -1,6 +1,6 @@ # manifest.py - manifest revision class for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -1,6 +1,6 @@ # match.py - filename matching # -# Copyright 2008, 2009 Matt Mackall and others +# Copyright 2008, 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -1,6 +1,6 @@ # mdiff.py - diff and patch routines for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1,6 +1,6 @@ # merge.py - directory-level update/merge handling for Mercurial # -# Copyright 2006, 2007 Matt Mackall +# Copyright 2006, 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/mergeutil.py b/mercurial/mergeutil.py --- a/mercurial/mergeutil.py +++ b/mercurial/mergeutil.py @@ -1,6 +1,6 @@ # mergeutil.py - help for merge processing in mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/minirst.py b/mercurial/minirst.py --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -1,6 +1,6 @@ # minirst.py - minimal reStructuredText parser # -# Copyright 2009, 2010 Matt Mackall and others +# Copyright 2009, 2010 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/mpatch.c b/mercurial/mpatch.c --- a/mercurial/mpatch.c +++ b/mercurial/mpatch.c @@ -14,7 +14,7 @@ allocation of intermediate Python objects. Working memory is about 2x the total number of hunks. - Copyright 2005, 2006 Matt Mackall + Copyright 2005, 2006 Olivia Mackall This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. diff --git a/mercurial/node.py b/mercurial/node.py --- a/mercurial/node.py +++ b/mercurial/node.py @@ -1,6 +1,6 @@ # node.py - basic nodeid manipulation for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/parser.py b/mercurial/parser.py --- a/mercurial/parser.py +++ b/mercurial/parser.py @@ -1,6 +1,6 @@ # parser.py - simple top-down operator precedence parser for mercurial # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/posix.py b/mercurial/posix.py --- a/mercurial/posix.py +++ b/mercurial/posix.py @@ -1,6 +1,6 @@ # posix.py - Posix utility function implementations for Mercurial # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pure/bdiff.py b/mercurial/pure/bdiff.py --- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -1,6 +1,6 @@ # bdiff.py - Python implementation of bdiff.c # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pure/charencode.py b/mercurial/pure/charencode.py --- a/mercurial/pure/charencode.py +++ b/mercurial/pure/charencode.py @@ -1,6 +1,6 @@ # charencode.py - miscellaneous character encoding # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pure/mpatch.py b/mercurial/pure/mpatch.py --- a/mercurial/pure/mpatch.py +++ b/mercurial/pure/mpatch.py @@ -1,6 +1,6 @@ # mpatch.py - Python implementation of mpatch.c # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pure/osutil.py b/mercurial/pure/osutil.py --- a/mercurial/pure/osutil.py +++ b/mercurial/pure/osutil.py @@ -1,6 +1,6 @@ # osutil.py - pure Python version of osutil.c # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -1,6 +1,6 @@ # parsers.py - Python implementation of parsers.c # -# Copyright 2009 Matt Mackall and others +# Copyright 2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pushkey.py b/mercurial/pushkey.py --- a/mercurial/pushkey.py +++ b/mercurial/pushkey.py @@ -1,6 +1,6 @@ # pushkey.py - dispatching for pushing and pulling keys # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/pvec.py b/mercurial/pvec.py --- a/mercurial/pvec.py +++ b/mercurial/pvec.py @@ -1,6 +1,6 @@ # pvec.py - probabilistic vector clocks for Mercurial # -# Copyright 2012 Matt Mackall +# Copyright 2012 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -1,7 +1,7 @@ # repair.py - functions for repository repair for mercurial # # Copyright 2005, 2006 Chris Mason -# Copyright 2007 Matt Mackall +# Copyright 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/requirements.py b/mercurial/requirements.py --- a/mercurial/requirements.py +++ b/mercurial/requirements.py @@ -1,6 +1,6 @@ # requirements.py - objects and functions related to repository requirements # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1,6 +1,6 @@ # revlog.py - storage back-end for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/revlogutils/constants.py b/mercurial/revlogutils/constants.py --- a/mercurial/revlogutils/constants.py +++ b/mercurial/revlogutils/constants.py @@ -1,6 +1,6 @@ # revlogdeltas.py - constant used for revlog logic # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2018 Octobus # # This software may be used and distributed according to the terms of the diff --git a/mercurial/revlogutils/deltas.py b/mercurial/revlogutils/deltas.py --- a/mercurial/revlogutils/deltas.py +++ b/mercurial/revlogutils/deltas.py @@ -1,6 +1,6 @@ # revlogdeltas.py - Logic around delta computation for revlog # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2018 Octobus # # This software may be used and distributed according to the terms of the diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -1,6 +1,6 @@ # revset.py - revision set queries for mercurial # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/revsetlang.py b/mercurial/revsetlang.py --- a/mercurial/revsetlang.py +++ b/mercurial/revsetlang.py @@ -1,6 +1,6 @@ # revsetlang.py - parser, tokenizer and utility for revision set language # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -1,6 +1,6 @@ # scmutil.py - Mercurial core utility functions # -# Copyright Matt Mackall +# Copyright Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/server.py b/mercurial/server.py --- a/mercurial/server.py +++ b/mercurial/server.py @@ -1,6 +1,6 @@ # server.py - utility and factory of server # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/similar.py b/mercurial/similar.py --- a/mercurial/similar.py +++ b/mercurial/similar.py @@ -1,6 +1,6 @@ # similar.py - mechanisms for finding similar files # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/smartset.py b/mercurial/smartset.py --- a/mercurial/smartset.py +++ b/mercurial/smartset.py @@ -1,6 +1,6 @@ # smartset.py - data structure for revision set # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/sshpeer.py b/mercurial/sshpeer.py --- a/mercurial/sshpeer.py +++ b/mercurial/sshpeer.py @@ -1,6 +1,6 @@ # sshpeer.py - ssh repository proxy class for mercurial # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py --- a/mercurial/sslutil.py +++ b/mercurial/sslutil.py @@ -1,6 +1,6 @@ # sslutil.py - SSL handling for mercurial # -# Copyright 2005, 2006, 2007, 2008 Matt Mackall +# Copyright 2005, 2006, 2007, 2008 Olivia Mackall # Copyright 2006, 2007 Alexis S. L. Carvalho # Copyright 2006 Vadim Gelfer # diff --git a/mercurial/stack.py b/mercurial/stack.py --- a/mercurial/stack.py +++ b/mercurial/stack.py @@ -1,6 +1,6 @@ # stack.py - Mercurial functions for stack definition # -# Copyright Matt Mackall and other +# Copyright Olivia Mackall and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py +++ b/mercurial/statichttprepo.py @@ -2,7 +2,7 @@ # # This provides read-only repo access to repositories exported via static http # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -1,6 +1,6 @@ # store.py - repository store handling for Mercurial # -# Copyright 2008 Matt Mackall +# Copyright 2008 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -1,6 +1,6 @@ # subrepo.py - sub-repository classes and factory # -# Copyright 2009-2010 Matt Mackall +# Copyright 2009-2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/subrepoutil.py b/mercurial/subrepoutil.py --- a/mercurial/subrepoutil.py +++ b/mercurial/subrepoutil.py @@ -1,6 +1,6 @@ # subrepoutil.py - sub-repository operations and substate handling # -# Copyright 2009-2010 Matt Mackall +# Copyright 2009-2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/tags.py b/mercurial/tags.py --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -1,6 +1,6 @@ # tags.py - read tag info from local repository # -# Copyright 2009 Matt Mackall +# Copyright 2009 Olivia Mackall # Copyright 2009 Greg Ward # # This software may be used and distributed according to the terms of the diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- a/mercurial/templatefilters.py +++ b/mercurial/templatefilters.py @@ -1,6 +1,6 @@ # templatefilters.py - common template expansion filters # -# Copyright 2005-2008 Matt Mackall +# Copyright 2005-2008 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/templatefuncs.py b/mercurial/templatefuncs.py --- a/mercurial/templatefuncs.py +++ b/mercurial/templatefuncs.py @@ -1,6 +1,6 @@ # templatefuncs.py - common template functions # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py --- a/mercurial/templatekw.py +++ b/mercurial/templatekw.py @@ -1,6 +1,6 @@ # templatekw.py - common changeset template keywords # -# Copyright 2005-2009 Matt Mackall +# Copyright 2005-2009 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -1,6 +1,6 @@ # templater.py - template expansion for output # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/templateutil.py b/mercurial/templateutil.py --- a/mercurial/templateutil.py +++ b/mercurial/templateutil.py @@ -1,6 +1,6 @@ # templateutil.py - utility for template evaluation # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -6,7 +6,7 @@ # effectively log-structured, this should amount to simply truncating # anything that isn't referenced in the changelog. # -# Copyright 2005, 2006 Matt Mackall +# Copyright 2005, 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/treediscovery.py b/mercurial/treediscovery.py --- a/mercurial/treediscovery.py +++ b/mercurial/treediscovery.py @@ -1,6 +1,6 @@ # discovery.py - protocol changeset discovery functions # -# Copyright 2010 Matt Mackall +# Copyright 2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -1,6 +1,6 @@ # ui.py - user interface bits for mercurial # -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/url.py b/mercurial/url.py --- a/mercurial/url.py +++ b/mercurial/url.py @@ -1,6 +1,6 @@ # url.py - HTTP handling for mercurial # -# Copyright 2005, 2006, 2007, 2008 Matt Mackall +# Copyright 2005, 2006, 2007, 2008 Olivia Mackall # Copyright 2006, 2007 Alexis S. L. Carvalho # Copyright 2006 Vadim Gelfer # diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -1,7 +1,7 @@ # util.py - Mercurial utility functions and platform specific implementations # # Copyright 2005 K. Thananchayan -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py --- a/mercurial/utils/procutil.py +++ b/mercurial/utils/procutil.py @@ -1,7 +1,7 @@ # procutil.py - utility for managing processes and executable environment # # Copyright 2005 K. Thananchayan -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/utils/resourceutil.py b/mercurial/utils/resourceutil.py --- a/mercurial/utils/resourceutil.py +++ b/mercurial/utils/resourceutil.py @@ -1,7 +1,7 @@ # resourceutil.py - utility for looking up resources # # Copyright 2005 K. Thananchayan -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/utils/stringutil.py b/mercurial/utils/stringutil.py --- a/mercurial/utils/stringutil.py +++ b/mercurial/utils/stringutil.py @@ -1,7 +1,7 @@ # stringutil.py - utility for generic string formatting, parsing, etc. # # Copyright 2005 K. Thananchayan -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -1,6 +1,6 @@ # verify.py - repository integrity checking for Mercurial # -# Copyright 2006, 2007 Matt Mackall +# Copyright 2006, 2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/vfs.py b/mercurial/vfs.py --- a/mercurial/vfs.py +++ b/mercurial/vfs.py @@ -1,6 +1,6 @@ # vfs.py - Mercurial 'vfs' classes # -# Copyright Matt Mackall +# Copyright Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/win32.py b/mercurial/win32.py --- a/mercurial/win32.py +++ b/mercurial/win32.py @@ -1,6 +1,6 @@ # win32.py - utility functions that use win32 API # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -1,6 +1,6 @@ # windows.py - Windows utility function implementations for Mercurial # -# Copyright 2005-2009 Matt Mackall and others +# Copyright 2005-2009 Olivia Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py --- a/mercurial/wireprotoserver.py +++ b/mercurial/wireprotoserver.py @@ -1,5 +1,5 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py --- a/mercurial/wireprotov1peer.py +++ b/mercurial/wireprotov1peer.py @@ -1,6 +1,6 @@ # wireprotov1peer.py - Client-side functionality for wire protocol version 1. # -# Copyright 2005-2010 Matt Mackall +# Copyright 2005-2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/wireprotov1server.py b/mercurial/wireprotov1server.py --- a/mercurial/wireprotov1server.py +++ b/mercurial/wireprotov1server.py @@ -1,6 +1,6 @@ # wireprotov1server.py - Wire protocol version 1 server functionality # -# Copyright 2005-2010 Matt Mackall +# Copyright 2005-2010 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/wireprotov2server.py b/mercurial/wireprotov2server.py --- a/mercurial/wireprotov2server.py +++ b/mercurial/wireprotov2server.py @@ -1,5 +1,5 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge -# Copyright 2005-2007 Matt Mackall +# Copyright 2005-2007 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/mercurial/worker.py b/mercurial/worker.py --- a/mercurial/worker.py +++ b/mercurial/worker.py @@ -442,7 +442,7 @@ we ever write workers that need to preserve grouping in input we should consider allowing callers to specify a partition strategy. - mpm is not a fan of this partitioning strategy when files are involved. + olivia is not a fan of this partitioning strategy when files are involved. In his words: Single-threaded Mercurial makes a point of creating and visiting diff --git a/rust/hgcli/README.md b/rust/hgcli/README.md --- a/rust/hgcli/README.md +++ b/rust/hgcli/README.md @@ -32,7 +32,7 @@ Mercurial Distributed SCM (version 5.3.1+433-f99cd77d53dc+20200331) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-2020 Matt Mackall and others + Copyright (C) 2005-2020 Olivia Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1706,7 +1706,7 @@ extra['console'] = [ { 'script': 'hg', - 'copyright': 'Copyright (C) 2005-2021 Matt Mackall and others', + 'copyright': 'Copyright (C) 2005-2021 Olivia Mackall and others', 'product_version': version, } ] @@ -1782,7 +1782,7 @@ setup( name='mercurial', version=setupversion, - author='Matt Mackall and many others', + author='Olivia Mackall and many others', author_email='mercurial@mercurial-scm.org', url='https://mercurial-scm.org/', download_url='https://mercurial-scm.org/release/', diff --git a/tests/logexceptions.py b/tests/logexceptions.py --- a/tests/logexceptions.py +++ b/tests/logexceptions.py @@ -1,6 +1,6 @@ # logexceptions.py - Write files containing info about Mercurial exceptions # -# Copyright 2017 Matt Mackall +# Copyright 2017 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -2,7 +2,7 @@ # # run-tests.py - Run a set of tests on Mercurial # -# Copyright 2006 Matt Mackall +# Copyright 2006 Olivia Mackall # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -676,7 +676,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -1555,7 +1555,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -1566,7 +1566,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -1580,7 +1580,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -1642,7 +1642,7 @@ Mercurial Distributed SCM (version 3.5.2) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -575,7 +575,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t --- a/tests/test-hgrc.t +++ b/tests/test-hgrc.t @@ -84,7 +84,7 @@ Mercurial Distributed SCM (version *) (glob) (see https://mercurial-scm.org for more information) - Copyright (C) 2005-* Matt Mackall and others (glob) + Copyright (C) 2005-* Olivia Mackall and others (glob) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ unset FAKEPATH diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t --- a/tests/test-patchbomb.t +++ b/tests/test-patchbomb.t @@ -2998,7 +2998,7 @@ bad value setting ----------------- - $ echo 'intro=mpmwearaclownnose' >> $HGRCPATH + $ echo 'intro=oliviawearaclownnose' >> $HGRCPATH single rev @@ -3006,7 +3006,7 @@ From [test]: test this patch series consists of 1 patches. - warning: invalid patchbomb.intro value "mpmwearaclownnose" + warning: invalid patchbomb.intro value "oliviawearaclownnose" (should be one of always, never, auto) -f test foo MIME-Version: 1.0 @@ -3047,7 +3047,7 @@ $ hg email --date '1980-1-1 0:1' -v -t '~foo/bar@example.com' -f 'me*@example.com' -r '10' this patch series consists of 1 patches. - warning: invalid patchbomb.intro value "mpmwearaclownnose" + warning: invalid patchbomb.intro value "oliviawearaclownnose" (should be one of always, never, auto) -f me*@example.com ~foo/bar@example.com MIME-Version: 1.0