# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1565112531 -7200
# Node ID f8602f426cc5877397f81d58903f426ea0d77fac
# Parent  48b30ff742cba4ed409cae14012dc363228d2714# Parent  dd68ce259708640e4fe4b705746a9dbe613f45b9
branching: merge with stable

format source worked smoothly :-)

diff -r 48b30ff742cb -r f8602f426cc5 contrib/hammerclient.py
--- a/contrib/hammerclient.py	Tue Aug 06 15:06:38 2019 +0200
+++ b/contrib/hammerclient.py	Tue Aug 06 19:28:51 2019 +0200
@@ -5,7 +5,7 @@
 
 if len(sys.argv) < 2:
     execname = os.path.basename(sys.argv[0])
-    print >> sys.stderr, "usage: %s CLIENT_ID" % execname
+    sys.stderr.write("usage: %s CLIENT_ID\n" % execname)
 
 client_id = sys.argv[1]
 
diff -r 48b30ff742cb -r f8602f426cc5 hgext3rd/topic/randomname.py
--- a/hgext3rd/topic/randomname.py	Tue Aug 06 15:06:38 2019 +0200
+++ b/hgext3rd/topic/randomname.py	Tue Aug 06 19:28:51 2019 +0200
@@ -295,6 +295,7 @@
     b'ancient',
     b'animated',
     b'apricot',
+    b'appropriate',
     b'aquatic',
     b'arctic',
     b'arenaceous',
diff -r 48b30ff742cb -r f8602f426cc5 tests/test-topic-mode.t
--- a/tests/test-topic-mode.t	Tue Aug 06 15:06:38 2019 +0200
+++ b/tests/test-topic-mode.t	Tue Aug 06 19:28:51 2019 +0200
@@ -228,7 +228,7 @@
   $ touch A
   $ hg add A
   $ hg commit -m "Add A" --config devel.randomseed=42
-  active topic 'panoramic-antelope' grew its first changeset
+  active topic 'palatial-antelope' grew its first changeset
   (see 'hg help topics' for more information)
 
   $ hg up -r "desc(ROOT)"
@@ -256,8 +256,8 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add B
   |
-  | o  changeset:   1:d4b548f35972
-  |/   topic:       panoramic-antelope
+  | o  changeset:   1:d502ab6d9d91
+  |/   topic:       palatial-antelope
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Add A
@@ -267,7 +267,7 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
-  $ hg merge panoramic-antelope
+  $ hg merge palatial-antelope
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge'
@@ -292,7 +292,7 @@
   $ touch A
   $ hg add A
   $ hg commit -m "Add A" --config devel.randomseed=42
-  active topic 'panoramic-antelope' grew its first changeset
+  active topic 'palatial-antelope' grew its first changeset
   (see 'hg help topics' for more information)
 
   $ hg up -r "desc(ROOT)"
@@ -320,8 +320,8 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add B
   |
-  | o  changeset:   1:d4b548f35972
-  |/   topic:       panoramic-antelope
+  | o  changeset:   1:d502ab6d9d91
+  |/   topic:       palatial-antelope
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Add A
@@ -331,7 +331,7 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
-  $ hg merge panoramic-antelope
+  $ hg merge palatial-antelope
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'merge'  --config devel.randomseed=1337