D10266: contributor: change mentions of mpm to olivia

Thu Mar 25 18:00:45 UTC 2021

Alphare created this revision.
Herald added a reviewer: indygreg.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Matt Mackall is now Olivia Mackall.
  I reached out to her about changing the copyright notices to reflect this
  change and she gave me the green light, so I changed everything relevant.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D10266

AFFECTED FILES
  Makefile
  contrib/all-revsets.txt
  contrib/base-revsets.txt
  contrib/check-code.py
  contrib/check-commit
  contrib/check-config.py
  contrib/hg-test-mode.el
  contrib/hgperf
  contrib/logo-droplets.svg
  contrib/memory.py
  contrib/packaging/debian/copyright
  contrib/packaging/inno/mercurial.iss
  contrib/packaging/wix/mercurial.wxs
  contrib/win32/ReadMe.html
  doc/runrst
  hg
  hgdemandimport/demandimportpy2.py
  hgext/convert/__init__.py
  hgext/convert/common.py
  hgext/convert/convcmd.py
  hgext/convert/cvs.py
  hgext/convert/darcs.py
  hgext/convert/git.py
  hgext/convert/hg.py
  hgext/patchbomb.py
  hgext/share.py
  hgext/win32text.py
  hgext/zeroconf/__init__.py
  i18n/da.po
  i18n/de.po
  i18n/el.po
  i18n/fr.po
  i18n/hggettext
  i18n/it.po
  i18n/ja.po
  i18n/pt_BR.po
  i18n/ro.po
  i18n/ru.po
  i18n/sv.po
  i18n/zh_CN.po
  i18n/zh_TW.po
  mercurial/ancestor.py
  mercurial/bdiff.c
  mercurial/branchmap.py
  mercurial/cacheutil.py
  mercurial/cext/bdiff.c
  mercurial/cext/charencode.c
  mercurial/cext/mpatch.c
  mercurial/cext/osutil.c
  mercurial/cext/parsers.c
  mercurial/cext/revlog.c
  mercurial/changegroup.py
  mercurial/changelog.py
  mercurial/cmdutil.py
  mercurial/commands.py
  mercurial/commandserver.py
  mercurial/config.py
  mercurial/context.py
  mercurial/copies.py
  mercurial/dagop.py
  mercurial/debugcommands.py
  mercurial/destutil.py
  mercurial/diffhelper.py
  mercurial/dirstate.py
  mercurial/dirstateguard.py
  mercurial/discovery.py
  mercurial/dispatch.py
  mercurial/encoding.py
  mercurial/error.py
  mercurial/exchange.py
  mercurial/extensions.py
  mercurial/fancyopts.py
  mercurial/filelog.py
  mercurial/filemerge.py
  mercurial/fileset.py
  mercurial/filesetlang.py
  mercurial/formatter.py
  mercurial/grep.py
  mercurial/hbisect.py
  mercurial/help.py
  mercurial/helptext/hg-ssh.8.txt
  mercurial/helptext/hg.1.txt
  mercurial/helptext/hgignore.5.txt
  mercurial/helptext/hgrc.5.txt
  mercurial/hg.py
  mercurial/hgweb/__init__.py
  mercurial/hgweb/common.py
  mercurial/hgweb/hgweb_mod.py
  mercurial/hgweb/hgwebdir_mod.py
  mercurial/hgweb/request.py
  mercurial/hgweb/server.py
  mercurial/hgweb/webcommands.py
  mercurial/hgweb/webutil.py
  mercurial/hook.py
  mercurial/httpconnection.py
  mercurial/httppeer.py
  mercurial/i18n.py
  mercurial/localrepo.py
  mercurial/lock.py
  mercurial/logcmdutil.py
  mercurial/mail.py
  mercurial/manifest.py
  mercurial/match.py
  mercurial/mdiff.py
  mercurial/merge.py
  mercurial/mergeutil.py
  mercurial/minirst.py
  mercurial/mpatch.c
  mercurial/node.py
  mercurial/parser.py
  mercurial/posix.py
  mercurial/pure/bdiff.py
  mercurial/pure/charencode.py
  mercurial/pure/mpatch.py
  mercurial/pure/osutil.py
  mercurial/pure/parsers.py
  mercurial/pushkey.py
  mercurial/pvec.py
  mercurial/repair.py
  mercurial/requirements.py
  mercurial/revlog.py
  mercurial/revlogutils/constants.py
  mercurial/revlogutils/deltas.py
  mercurial/revset.py
  mercurial/revsetlang.py
  mercurial/scmutil.py
  mercurial/server.py
  mercurial/similar.py
  mercurial/smartset.py
  mercurial/sshpeer.py
  mercurial/sslutil.py
  mercurial/stack.py
  mercurial/statichttprepo.py
  mercurial/store.py
  mercurial/subrepo.py
  mercurial/subrepoutil.py
  mercurial/tags.py
  mercurial/templatefilters.py
  mercurial/templatefuncs.py
  mercurial/templatekw.py
  mercurial/templater.py
  mercurial/templateutil.py
  mercurial/transaction.py
  mercurial/treediscovery.py
  mercurial/ui.py
  mercurial/url.py
  mercurial/util.py
  mercurial/utils/procutil.py
  mercurial/utils/resourceutil.py
  mercurial/utils/stringutil.py
  mercurial/verify.py
  mercurial/vfs.py
  mercurial/win32.py
  mercurial/windows.py
  mercurial/wireprotoserver.py
  mercurial/wireprotov1peer.py
  mercurial/wireprotov1server.py
  mercurial/wireprotov2server.py
  mercurial/worker.py
  rust/hgcli/README.md
  setup.py
  tests/logexceptions.py
  tests/run-tests.py
  tests/test-extension.t
  tests/test-help.t
  tests/test-hgrc.t
  tests/test-patchbomb.t

CHANGE DETAILS

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 at 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 at example.com
   MIME-Version: 1.0
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-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-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/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 <mpm at selenic.com>
+# Copyright 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2017 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 at mercurial-scm.org',
     url='https://mercurial-scm.org/',
     download_url='https://mercurial-scm.org/release/',
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/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/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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others
+# Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+#  Copyright Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <thananck at yahoo.com>
-#  Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+#  Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #  Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # 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 <thananck at yahoo.com>
-#  Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+#  Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #  Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # 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 <thananck at yahoo.com>
-#  Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+#  Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #  Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # This software may be used and distributed according to the terms of the
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 <thananck at yahoo.com>
-#  Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+#  Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #  Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # This software may be used and distributed according to the terms of the
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 <mpm at selenic.com>
+# Copyright 2005, 2006, 2007, 2008 Olivia Mackall <olivia at selenic.com>
 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis at cecm.usp.br>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2009 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005-2008 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2009 Olivia Mackall <olivia at selenic.com>
 # Copyright 2009 Greg Ward <greg at gerg.ca>
 #
 # This software may be used and distributed according to the terms of the
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 <mpm at selenic.com>
+# Copyright 2009-2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2009-2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2008 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com> and other
+#  Copyright Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005, 2006, 2007, 2008 Olivia Mackall <olivia at selenic.com>
 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis at cecm.usp.br>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+#  Copyright Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 # Copyright 2018 Octobus <contact at octobus.net>
 #
 # This software may be used and distributed according to the terms of the
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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 # Copyright 2018 Octobus <contact at octobus.net>
 #
 # This software may be used and distributed according to the terms of the
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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mason at suse.com>
-# 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/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 <mpm at selenic.com>
+# Copyright 2012 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+#  Copyright 2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+ Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 
  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/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 <mpm at selenic.com> and others
+# Copyright 2009, 2010 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2008, 2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # This software may be used and distributed according to the terms of the
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 <mpm at selenic.com>
+# Copyright 2005, 2006, 2007, 2008 Olivia Mackall <olivia at selenic.com>
 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis at cecm.usp.br>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 # Copyright 2011 Google, Inc.
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 <mpm at selenic.com>
+# Copyright 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005, 2006 Matt Mackall <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005, 2006 Matt Mackall <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005-2007 Matt Mackall <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <jake at edge2.net>
-# Copyright 2005, 2006 Matt Mackall <mpm at selenic.com>
+# Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/__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 <jake at edge2.net>
-# Copyright 2005 Matt Mackall <mpm at selenic.com>
+# Copyright 2005 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer at gmail.com>
 #
 # This software may be used and distributed according to the terms of the
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 <bos at serpentine.com>.
 
-Mercurial was written by Matt Mackall <mpm at selenic.com>.
+Mercurial was written by Olivia Mackall <olivia at selenic.com>.
 
 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/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 <vadim.gelfer at gmail.com>
 
-Mercurial was written by Matt Mackall <mpm at selenic.com>.
+Mercurial was written by Olivia Mackall <olivia at selenic.com>.
 
 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/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 <mpm at selenic.com>
+:Author:         Olivia Mackall <olivia at selenic.com>
 :Organization:   Mercurial
 :Manual section: 1
 :Manual group:   Mercurial Manual
@@ -100,7 +100,7 @@
 
 Author
 """"""
-Written by Matt Mackall <mpm at selenic.com>
+Written by Olivia Mackall <olivia at selenic.com>
 
 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/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 <mpm at selenic.com>
+Written by Olivia Mackall <olivia at selenic.com>
 
 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/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 <mpm at selenic.com>
+# Copyright 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <benoit.boissinot at ens-lyon.org>
 #
 # Inspired by git bisect, extension skeleton taken from mq.py.
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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2012 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2006, 2007, 2008 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2008 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and other
+#  Copyright Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2016 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2008 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+#  Copyright Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com>
+#  Copyright 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com> and others
+ Copyright 2008 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+ Copyright 2008 Olivia Mackall <olivia at selenic.com> 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/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/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 <mpm at selenic.com>
+ Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 
  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 <mpm at selenic.com> and others
+ Copyright 2008 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+ Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 
  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/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 <mpm at selenic.com> and other
+#  Copyright Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+ Copyright 2005, 2006 Olivia Mackall <olivia at selenic.com>
 
  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/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 <mpm at selenic.com>
+# Copyright 2006 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com> and others
+# Copyright (C) 2009 Olivia Mackall <olivia at selenic.com> and others
 # This file is distributed under the same license as the Mercurial package.
 # Chia-Huan Wu <willie.tw at gmail.com>, 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/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 <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2010 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> å’Œå…¶ä»–äººã€‚\n"
+"ç‰ˆæƒæ‰€æœ‰ (C) 2005-2010 Olivia Mackall <olivia at selenic.com> å’Œå…¶ä»–äººã€‚\n"
 "è¿™æ˜¯è‡ªç”±è½¯ä»¶ï¼Œå…·ä½“å‚è§ç‰ˆæƒæ¡æ¬¾ã€‚è¿™é‡Œæ²¡æœ‰ä»»ä½•æ‹…ä¿ï¼Œç”šè‡³æ²¡æœ‰é€‚åˆ\n"
 "ç‰¹å®šç›®çš„çš„éšå«çš„æ‹…ä¿ã€‚\n"
 
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/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 <mpm at selenic.com> and others
+# Copyright (C) 2011 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\n"
 ":Organization:   Mercurial\n"
 ":Manual section: 1\n"
 ":Manual group:   Mercurial Manual"
@@ -22000,11 +22000,11 @@
 msgid ""
 "Author\n"
 "\"\"\"\"\"\"\n"
-"Written by Matt Mackall <mpm at selenic.com>"
+"Written by Olivia Mackall <olivia at selenic.com>"
 msgstr ""
 "ÐÐ²Ñ‚Ð¾Ñ€\n"
 "\"\"\"\"\"\n"
-"Matt Mackall <mpm at selenic.com>"
+"Olivia Mackall <olivia at selenic.com>"
 
 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 <vadim.gelfer at gmail.com>"
 
-msgid "Mercurial was written by Matt Mackall <mpm at selenic.com>."
-msgstr "Mercurial Ð½Ð°Ð¿Ð¸ÑÐ°Ð½ Matt Mackall <mpm at selenic.com>."
+msgid "Mercurial was written by Olivia Mackall <olivia at selenic.com>."
+msgstr "Mercurial Ð½Ð°Ð¿Ð¸ÑÐ°Ð½ Olivia Mackall <olivia at selenic.com>."
 
 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/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 <mpm at selenic.com> and others
+# Copyright (C) 2010 Olivia Mackall <olivia at selenic.com> 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/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 <diego at diegooliveira.com>
@@ -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 <mpm at selenic.com>"
+"Written by Olivia Mackall <olivia at selenic.com>"
 msgstr ""
 "Autor\n"
 "\"\"\"\"\"\n"
-"Escrito por Matt Mackall <mpm at selenic.com>"
+"Escrito por Olivia Mackall <olivia at selenic.com>"
 
 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 <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\n"
 ":Organization:   Mercurial\n"
 ":Manual section: 1\n"
 ":Manual group:   Mercurial Manual"
 msgstr ""
-":Author:         Matt Mackall <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\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 <vadim.gelfer at gmail.com>"
 
-msgid "Mercurial was written by Matt Mackall <mpm at selenic.com>."
-msgstr "Mercurial foi escrito por Matt Mackall <mpm at selenic.com>."
+msgid "Mercurial was written by Olivia Mackall <olivia at selenic.com>."
+msgstr "Mercurial foi escrito por Olivia Mackall <olivia at selenic.com>."
 
 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/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 <mpm at selenic.com>"
+"Written by Olivia Mackall <olivia at selenic.com>"
 msgstr ""
 "è‘—è€…\n"
 "\"\"\"\"\n"
-"Matt Mackall <mpm at selenic.com>"
+"Olivia Mackall <olivia at selenic.com>"
 
 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 <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\n"
 ":Organization:   Mercurial\n"
 ":Manual section: 1\n"
 ":Manual group:   Mercurial Manual"
 msgstr ""
-":Author:         Matt Mackall <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\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 <vadim.gelfer at gmail.com> ã§ã™ã€‚"
 
-msgid "Mercurial was written by Matt Mackall <mpm at selenic.com>."
-msgstr "Mercurial ã®è‘—è€…ã¯ Matt Mackall <mpm at selenic.com> ã§ã™ã€‚"
+msgid "Mercurial was written by Olivia Mackall <olivia at selenic.com>."
+msgstr "Mercurial ã®è‘—è€…ã¯ Olivia Mackall <olivia at selenic.com> ã§ã™ã€‚"
 
 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/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/hggettext b/i18n/hggettext
--- a/i18n/hggettext
+++ b/i18n/hggettext
@@ -2,7 +2,7 @@
 #
 # hggettext - carefully extract docstrings for Mercurial
 #
-# Copyright 2009 Matt Mackall <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others
+# Copyright (C) 2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2010 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2010 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> ÎºÎ±Î¹ Î¬Î»Î»Î¿Î¹\n"
+"Î Î½ÎµÏ…Î¼Î±Ï„Î¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± (C) 2005-2009 Olivia Mackall <olivia at selenic.com> ÎºÎ±Î¹ Î¬Î»Î»Î¿Î¹\n"
 "Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î± ÎµÎ¯Î½Î±Î¹ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒÂ· Î´ÎµÎ¯Ï„Îµ Ï„Î¿Î½ Ï€Î·Î³Î±Î¯Î¿ ÎºÏŽÎ´Î¹ÎºÎ± Î³Î¹Î±\n"
 "Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï…. Î”ÎµÎ½ Ï€Î±ÏÎÏ‡ÎµÏ„Î±Î¹ ÎšÎ‘ÎœÎ™Î‘ ÎµÎ³Î³ÏÎ·ÏƒÎ·Â· Î¿ÏÏ„Îµ ÎºÎ±Î½ Î³Î¹Î± Ï„Î·Î½\n"
 "Î•ÎœÎ ÎŸÎ¡Î•Î¥Î£Î™ÎœÎŸÎ¤Î—Î¤Î‘ Î® Ï„Î·Î½ ÎšÎ‘Î¤Î‘Î›Î›Î—Î›ÎŸÎ¤Î—Î¤Î‘ Î“Î™Î‘ ÎšÎ‘Î ÎŸÎ™ÎŸ Î£ÎšÎŸÎ ÎŸ.\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 <mpm at selenic.com>\n"
+":Author:         Olivia Mackall <olivia at selenic.com>\n"
 ":Organization:   Mercurial\n"
 ":Manual section: 1\n"
 ":Manual group:   Mercurial Manual"
@@ -19032,7 +19032,7 @@
 msgid ""
 "Author\n"
 "\"\"\"\"\"\"\n"
-"Written by Matt Mackall <mpm at selenic.com>"
+"Written by Olivia Mackall <olivia at selenic.com>"
 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 <vadim.gelfer at gmail.com>"
 msgstr ""
 
-msgid "Mercurial was written by Matt Mackall <mpm at selenic.com>."
+msgid "Mercurial was written by Olivia Mackall <olivia at selenic.com>."
 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/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/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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005, 2007-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com> and others
+#  Copyright 2007-2009 Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com> and others
+#  Copyright 2005-2009 Olivia Mackall <olivia at selenic.com> 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/__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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2005-2007 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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 <mpm at selenic.com> and others
+# Copyright 2010 Olivia Mackall <olivia at selenic.com> 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/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -140,7 +140,7 @@
     </p>
 
     <p>
-      Mercurial is Copyright 2005-2021 Matt Mackall and others.
+      Mercurial is Copyright 2005-2021 Olivia Mackall and others.
     </p>
 
     <p>
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'>
 
     <Package Id='*'
       Keywords='Installer'
       Description="Mercurial distributed SCM (version $(var.Version))"
       Comments='$(var.Comments)'
       Platform='$(var.Platform)'
-      Manufacturer='Matt Mackall and others'
+      Manufacturer='Olivia Mackall and others'
       InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
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/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 <mpm at selenic.com> and others.
+Copyright: 2005-2021, Olivia Mackall <olivia at selenic.com> 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/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 <mpm at selenic.com> and others
+# Copyright 2009 Olivia Mackall <olivia at selenic.com> 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/logo-droplets.svg b/contrib/logo-droplets.svg
--- a/contrib/logo-droplets.svg
+++ b/contrib/logo-droplets.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="120" width="100" version="1.0" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 124.766 152.099"><metadata id="metadata6845"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title>Mercurial "droplets" logo</dc:title><dc:creator><cc:Agent><dc:title>Cali Mastny and Matt Mackall</dc:title></cc:Agent></dc:creator><cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"/><dc:date>Feb 12 2008</dc:date></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/><cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/><cc:requires rdf:resource="http://web.resource.org/cc/Notice"/><cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/><cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/><cc:requires rdf:resource="http://web.resource.org/cc/SourceCode"/></cc:License></rdf:RDF></metadata>
+<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="120" width="100" version="1.0" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 124.766 152.099"><metadata id="metadata6845"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title>Mercurial "droplets" logo</dc:title><dc:creator><cc:Agent><dc:title>Cali Mastny and Olivia Mackall</dc:title></cc:Agent></dc:creator><cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"/><dc:date>Feb 12 2008</dc:date></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/><cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/><cc:requires rdf:resource="http://web.resource.org/cc/Notice"/><cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/><cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/><cc:requires rdf:resource="http://web.resource.org/cc/SourceCode"/></cc:License></rdf:RDF></metadata>
 <rect id="rect6847" stroke-linejoin="miter" style="stroke-dasharray:none;" height="150.12" width="124.77" stroke="#000" stroke-miterlimit="4" y="0.98776" x="0.3169" stroke-width="1.9755" fill="#FFF"/><path id="text2611" style="stroke-dasharray:none;" d="M9.848,124.61c1.777-0.79,3.665-1.18,5.479-1.18,1.74,0,2.851,0.43,3.48,1.32,1.332-0.89,3.146-1.32,4.553-1.32,4.221,0,4.369,1.71,4.369,6.73v11.11c0,0.49,0.074,0.49-2.036,0.49v-11.81c0-3.63-0.074-4.74-2.48-4.74-1.073,0-2.184,0.25-3.369,1.03v15.27c-0.037,0.15-0.111,0.18-0.369,0.22-0.038,0-0.074,0.03-0.112,0.03h-1.555v-11.81c0-3.49,0-4.77-2.517-4.77-1.074,0-2.147,0.21-3.406,0.82v15.27c0,0.49,0.074,0.49-2.0361,0.49v-17.15m27.831-1.18c-3.146,0-6.626,0.89-6.626,10.4,0,7.33,2.554,8.47,6.071,8.47,2.701,0,5.034-0.89,5.034-1.32,0-0.53-0.074-1.35-0.259-1.82-1.148,0.79-2.777,1.21-4.59,1.21-2.48,0-4.146-0.71-4.184-6.22,1.629,0,5.776-0.04,8.848-0.65,0.259-1.17,0.37-2.88,0.37-4.37,0-3.56-1.444-5.7-4.664-5.7m-0.185,1.78c2.221,0,2.813,1.46,2.85,4.31,0,0.75-0.037,1.64-0.148,2.49-2.073,0.5-5.591,0.5-7.072,0.5,0.261-6.48,2.481-7.3,4.37-7.3m8.07-0.21c1.739-1.14,3.332-1.57,4.961-1.57,1.814,0,2.666,0.5,2.666,1.11,0,0.35-0.112,0.96-0.297,1.31-0.519-0.28-1.11-0.53-2.074-0.53-1.184,0-2.295,0.32-3.183,1.1v14.85c0,0.49,0.037,0.49-2.073,0.49v-16.76m18.69-0.39c0-0.47-1.554-1.18-3.11-1.18-2.999,0-6.664,1.03-6.664,9.83,0,8.33,2.222,9.07,6.109,9.07,1.924,0,3.665-1.03,3.665-1.6,0-0.32-0.074-0.82-0.26-1.24-0.778,0.56-1.962,1.1-3.22,1.1-2.665,0-4.22-0.75-4.22-7.23,0-7.15,2.554-8.15,4.775-8.15,1.258,0,1.962,0.36,2.665,0.82,0.186-0.43,0.26-1.03,0.26-1.42m14.181,16.55c-1.63,0.82-3.776,1.14-5.627,1.14-4.739,0-5.442-1.99-5.442-6.73v-11.14c0-0.46-0.037-0.46,2.074-0.46v11.82c0,3.56,0.517,4.77,3.294,4.77,1.073,0,2.554-0.22,3.665-0.86v-15.27c0-0.46-0.074-0.46,2.036-0.46v17.19m4.221-16.16c1.739-1.14,3.332-1.57,4.96-1.57,1.814,0,2.666,0.5,2.666,1.11,0,0.35-0.111,0.96-0.296,1.31-0.519-0.28-1.111-0.53-2.074-0.53-1.184,0-2.295,0.32-3.183,1.1v14.85c0,0.49,0.037,0.49-2.073,0.49v-16.76m12.379-1.03c-1.629,0-2.11,0-2.11,0.96v16.83c2.073,0,2.11,0,2.11-0.49v-17.3m-2.184-6.27c0,1.18,0.37,1.6,1.11,1.64,0.851,0,1.259-0.61,1.259-1.67,0.037-1.11-0.26-1.61-1.111-1.61-0.814,0-1.221,0.61-1.258,1.64m5.696,7.3c0-0.39,0.074-0.61,0.222-0.71,0.704-0.39,3.41-0.86,6.48-0.86,2.33,0,3.81,1.11,3.81,4.31v2.31c0,6.34-0.18,11.07-0.18,11.07-0.85,0.47-2.45,1.18-5.04,1.18-2.66,0.03-5.329-0.22-5.329-5.48,0-5.02,2.739-5.81,5.479-5.81,1.04,0,2.26,0.11,3.07,0.43v-3.31c0-2.31-1.18-2.81-2.59-2.81-1.89,0-4.514,0.35-5.662,0.89-0.222-0.39-0.26-1-0.26-1.21m8.512,7.9c-0.7-0.25-1.7-0.35-2.4-0.35-2.11,0-4.04,0.42-4.04,4.34,0,3.66,1.59,3.7,3.48,3.7,1.19,0,2.37-0.32,2.78-0.75,0,0,0.18-4.27,0.18-6.94m7.86,8.37c0,0.49,0.04,0.49-2.04,0.49v-25.2c0-0.96,0.41-0.96,2.04-0.96v25.67" stroke-miterlimit="4" stroke-width="2.02999997" fill="#010101"/><g id="g4503" transform="matrix(0.9351326,0,0,0.9351326,150.39508,-1.251766)"><path id="path2339" fill="#1b1a1b" d="M-45.75,92.692c20.04-33.321-4.232-87.363-48.614-81.873-40.096,4.958-40.746,47.165-5.405,57.191,30.583,8.685,6.318,28.084,7.027,41,0.712,12.92,26.587,17.6,46.992-16.318z"/><circle id="circle2341" transform="matrix(1.0917947,-0.2858168,0.2858168,1.0917947,-180.30817,13.494135)" cy="85.364" cx="33.728" r="15.414" fill="#1b1a1b"/><path id="path2343" fill="#1b1a1b" d="M-140.06,48.936c-6.26,0.606-10.84,6.164-10.24,12.422,0.61,6.262,6.17,10.847,12.43,10.241,6.26-0.614,10.84-6.171,10.23-12.43-0.61-6.253-6.16-10.839-12.42-10.233z"/><path id="path2561" fill="#bfbfbf" d="M-44.993,91.34c20.041-33.321-4.231-87.363-48.613-81.873-40.104,4.9568-40.744,47.166-5.406,57.193,30.583,8.684,6.318,28.083,7.027,41,0.713,12.92,26.587,17.6,46.992-16.32z"/><path id="path2563" fill="#000" d="M-86.842,112.76c-1.215-1.97,0.642-4.16,2.551-3.99,3.039,0.26,9.655-0.04,14.876-3,13.043-7.39,33.114-42.966,23.019-65.405-4.519-10.044-6.72-12.92-11.374-17.833-0.95-1.002-0.405-0.948,0.238-0.609,2.517,1.321,6.94,6.437,11.477,14.765,7.664,14.069,7.267,30.795,4.416,41.287-1.986,7.299-8.825,23.815-18.842,30.955-10.039,7.15-21.785,11.26-26.361,3.83z"/><path id="path2565" fill="#000" d="M-95.93,66.591c-6.83-2.028-15.64-4.853-20.74-11.517-3.75-4.914-5.66-10.277-6.15-13.318-0.17-1.085-0.32-1.991-0.01-2.24,0.15-0.117,2.81,5.896,6.79,10.936,3.97,5.04,9.53,7.988,14.16,9.059,4.117,0.952,12.646,3.044,15.532,5.503,2.967,2.527,3.215,7.987,2.216,8.603-1.006,0.62-3.048-4.429-11.798-7.026z"/><path id="path2567" fill="#FFF" d="M-81.841,113.72c-0.132,1.57,1.665,1.87,4.083,1.51,3.099-0.46,5.72-0.81,9.287-2.6,4.835-2.42,9.728-5.89,13.312-10.57,10.692-13.945,14.478-30.45,13.895-32.824-0.195,1.961-2.776,12.253-8.679,21.532-7.582,11.922-13.079,18.262-25.758,21.342-3.529,0.86-5.967-0.45-6.14,1.61z"/><path id="path2569" fill="#FFF" d="M-109.96,59.479c1.44,1.225,4.4,2.857,10.223,4.767,7.031,2.305,10.455,4.304,11.888,5.262,1.52,1.018,2.483,3.288,2.578,1.272,0.099-2.019-1.145-3.755-3.921-4.675-1.878-0.624-5.038-2.109-8.067-2.707-1.946-0.384-5.111-1.146-7.831-1.978-1.48-0.457-3-1.258-4.87-1.941z"/><circle id="circle2577" transform="matrix(1.0917947,-0.2858168,0.2858168,1.0917947,-180.30817,13.494135)" cy="84.375" cx="34.681" r="15.414" fill="#bfbfbf"/><path id="path2579" fill="#000" d="M-128.68,108.38c13.53,12.54,33.894-4.69,24.93-19.897-1.01-1.708-2.32-3.009-1.89-1.7,2.87,8.747,0.22,15.667-4.72,19.227-4.85,3.5-11.51,4.09-16.84,1.32-1.57-0.81-2.22,0.37-1.48,1.05z"/><path id="path2585" fill="#FFF" d="M-118.07,110.95c1.73-0.36,11.75-2.95,14.1-11.194,0.73-2.569,0.86-2.053,0.66-0.661-1.06,7.105-7.78,12.345-13.49,12.545-1.16,0.12-2.68-0.39-1.27-0.69z"/><path id="path2589" fill="#bfbfbf" d="M-139.3,47.584c-6.26,0.605-10.84,6.164-10.24,12.422,0.61,6.261,6.17,10.847,12.43,10.241,6.25-0.614,10.84-6.173,10.23-12.431-0.61-6.254-6.17-10.838-12.42-10.232z"/><path id="path2591" fill="#000" d="M-144.47,67.571c0.07,0.805,1.17,1.838,2.9,2.312,1.49,0.408,5.32,1.45,10.25-1.658,4.92-3.108,5.49-11.421,3.25-13.865-0.69-1.239-1.59-2.14-0.88-0.164,1.81,4.99-1.7,9.659-4.74,11.82-3.03,2.162-6.88,1.139-8.45,0.66s-2.4,0.064-2.33,0.895z"/><path id="path2597" fill="#FFF" d="M-138.11,68.688c0.45-0.406,2.73-0.24,4.79-1.35,2.07-1.109,4.52-3.54,4.95-6.994,0.26-2.029,0.34-1.519,0.44-0.415-0.32,5.743-5.6,8.916-8.62,9.334-0.82,0.113-2.25,0.044-1.56-0.575z"/><path id="path2561_1_" fill="#999" d="M-47.767,69.694c8.532-24.594-9.323-61.736-45.446-57.268-32.637,4.035-33.167,38.389-4.4,46.55,32.582,4.933,12.962,29.512,10.179,41.904-2.495,11.11,26.331,12.94,39.667-31.186z"/><path id="path2571" fill="#f3f3f3" d="M-70.093,88.904c-8.827-1.092-21.529,18.836-9.552,16.506,5.756-0.86,10.525-2.89,14.794-7.762,5.567-6.353,13.883-20.074,16.288-28.94,2.025-7.476,1.007-19.057-1.081-8.175-2.142,11.167-11.623,29.464-20.449,28.371z"/><path id="path2581" fill="#999" d="M-129.39,104.85c2.05,0.03,3.28,0.32,5.35,1.77,4.09,1.7,11.61,0.62,15.09-3.95,3.47-4.57,3.58-10.868,2.26-14.674-3.24-9.314-16.99-9.149-23.13-1.417-6.64,8.636-1.61,18.231,0.43,18.271z"/><path id="path2593_2_" fill="#999" d="M-147.64,61.684c0.41,1.282,1.45,3.154,3.65,3.466,2.94,0.417,3.54,1.743,7,1.055,3.47-0.688,6.09-3.528,7.14-6.67,1.21-4.347-0.59-6.591-3.31-8.595-2.71-2.003-8.67-1.788-12.23,1.458-2.53,2.305-3.24,6.163-2.25,9.286z"/><path id="path256" fill="#f3f3f3" d="M-136.11,64.558c2.66-0.697,6.18-4.325,4.44-7.096-2.16-3.413-8.17-0.491-8.37,3.309-0.21,3.802,1.11,4.526,3.93,3.787z"/><path id="path258" fill="#f3f3f3" d="M-116.12,105.51c2.28-0.6,9.24-3.43,7.93-13.547-0.66-5.126-3.46,6.361-8.63,8.077-7.85,2.61-6.97,7.48,0.7,5.47z"/></g>
 </svg>
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 <mpm at selenic.com>
+# Copyright 2014 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+;; Copyright 2014 Olivia Mackall <olivia at selenic.com>
 ;; "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/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 <mpm at selenic.com>
+# Copyright 2015 Olivia Mackall <olivia at selenic.com>
 #
 # 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 <mpm at selenic.com>
+# Copyright 2014 Olivia Mackall <olivia at selenic.com>
 #
 # 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-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 <mpm at selenic.com>
+# Copyright 2010 Olivia Mackall <olivia at selenic.com>
 #
 # 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/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/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/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@
 	$(PYFILESCMD) | xargs \
 	  xgettext --package-name "Mercurial" \
 	  --msgid-bugs-address "<mercurial-devel at mercurial-scm.org>" \
-	  --copyright-holder "Matt Mackall <mpm at selenic.com> and others" \
+	  --copyright-holder "Olivia Mackall <olivia at selenic.com> 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



To: Alphare, indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
