# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1553595789 -3600
# Node ID 5205e3dedafcd54bf8b3c244b1092e9cc6f5c919
# Parent  ea336a6592cc33a013c21f0310d50cbc84bffd94# Parent  8232bddf543a2cd3818ee029ed7a0bab949a93e8
branching: merge with stable

diff -r ea336a6592cc -r 5205e3dedafc CHANGELOG
--- a/CHANGELOG	Sun Mar 24 21:30:12 2019 +0530
+++ b/CHANGELOG	Tue Mar 26 11:23:09 2019 +0100
@@ -15,6 +15,8 @@
 
   * split: preserve phases (issue6048)
   * evolve: fix an recoverable state (issue6053)
+  * prune: fix error message when pruning public changesets
+  * touch: fix error message when touching public changesets
 
 8.4.0 -- 2019-12-22
 -------------------
diff -r ea336a6592cc -r 5205e3dedafc hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Sun Mar 24 21:30:12 2019 +0530
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Mar 26 11:23:09 2019 +0100
@@ -1006,7 +1006,7 @@
     try:
         wlock = repo.wlock()
         lock = repo.lock()
-        rewriteutil.precheck(repo, revs, 'touch')
+        rewriteutil.precheck(repo, revs, 'prune')
         tr = repo.transaction('prune')
         # defines pruned changesets
         precs = []
@@ -1324,7 +1324,7 @@
         ui.write_err('no revision to touch\n')
         return 1
     if not duplicate:
-        rewriteutil.precheck(repo, revs, touch)
+        rewriteutil.precheck(repo, revs, 'touch')
     tmpl = utility.shorttemplate
     displayer = compat.changesetdisplayer(ui, repo, {'template': tmpl})
     wlock = lock = tr = None
diff -r ea336a6592cc -r 5205e3dedafc tests/test-evolve.t
--- a/tests/test-evolve.t	Sun Mar 24 21:30:12 2019 +0530
+++ b/tests/test-evolve.t	Tue Mar 26 11:23:09 2019 +0100
@@ -145,7 +145,7 @@
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public 
   $ hg prune 1
-  abort: cannot touch public changesets: 7c3bad9141dc
+  abort: cannot prune public changesets: 7c3bad9141dc
   (see 'hg help phases' for details)
   [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
@@ -1310,11 +1310,11 @@
   $ mkcommit c5_
   created new head
   $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
-  abort: touch will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
   $ hg prune '98e171e2f272::0d9203b74542'
-  abort: touch will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
   $ hg prune '0ef9ff75f8e2::'
diff -r ea336a6592cc -r 5205e3dedafc tests/test-prune.t
--- a/tests/test-prune.t	Sun Mar 24 21:30:12 2019 +0530
+++ b/tests/test-prune.t	Tue Mar 26 11:23:09 2019 +0100
@@ -92,7 +92,7 @@
 cannot prune public changesets
 
   $ hg prune 0
-  abort: cannot touch public changesets: 1f0dee641bb7
+  abort: cannot prune public changesets: 1f0dee641bb7
   (see 'hg help phases' for details)
   [255]
   $ hg debugobsolete
diff -r ea336a6592cc -r 5205e3dedafc tests/test-touch.t
--- a/tests/test-touch.t	Sun Mar 24 21:30:12 2019 +0530
+++ b/tests/test-touch.t	Tue Mar 26 11:23:09 2019 +0100
@@ -161,3 +161,12 @@
        rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re)
          note: testing with no successor
   
+
+Public phase
+
+  $ hg phase --public -r 2
+  $ hg touch 2
+  abort: cannot touch public changesets: * (glob)
+  (see 'hg help phases' for details)
+  [255]
+  $ hg touch --duplicate 2