destroyed: invalidate phraserevs cache in all case (issue3858)

When revisions are destroyed, the `phaserevs` cache becomes invalid in most case.
This cache hold a `{rev => phase}` mapping and revision number most likely
changed.

Since 1c8e0d6ac3b0, we filter unknown phases' roots after changesets
destruction.  When some roots are filtered the `phaserevs` cache is invalidated.
But not if none root where destroyed.

We now invalidate the cache in all case filtered root or not.

This bug was a bit tricky to reproduce as in most case we either:
* rebase a set a draft changeset including root (phaserev invalidated)
* strip tip-most changesets (no re-numbering of revision)

Note that the invalidation of `phaserevs` are not strictly needed when only
tip-most part of the history have been destroyed. But I do not expect the
overhead to be significant.

mercurial/phases.py

@@ -1,400 +1,408 b''
 """ Mercurial phases support code
 
     ---
 
     Copyright 2011 Pierre-Yves David <[e-mail]>
                    Logilab SA        <[e-mail]>
                    Augie Fackler     <[e-mail]>
 
     This software may be used and distributed according to the terms
     of the GNU General Public License version 2 or any later version.
 
     ---
 
 This module implements most phase logic in mercurial.
 
 
 Basic Concept
 =============
 
 A 'changeset phase' is an indicator that tells us how a changeset is
 manipulated and communicated. The details of each phase is described
 below, here we describe the properties they have in common.
 
 Like bookmarks, phases are not stored in history and thus are not
 permanent and leave no audit trail.
 
 First, no changeset can be in two phases at once. Phases are ordered,
 so they can be considered from lowest to highest. The default, lowest
 phase is 'public' - this is the normal phase of existing changesets. A
 child changeset can not be in a lower phase than its parents.
 
 These phases share a hierarchy of traits:
 
             immutable shared
     public:     X        X
     draft:               X
     secret:
 
 Local commits are draft by default.
 
 Phase Movement and Exchange
 ===========================
 
 Phase data is exchanged by pushkey on pull and push. Some servers have
 a publish option set, we call such a server a "publishing server".
 Pushing a draft changeset to a publishing server changes the phase to
 public.
 
 A small list of fact/rules define the exchange of phase:
 
 * old client never changes server states
 * pull never changes server states
 * publish and old server changesets are seen as public by client
 * any secret changeset seen in another repository is lowered to at
   least draft
 
 Here is the final table summing up the 49 possible use cases of phase
 exchange:
 
                            server
                   old     publish      non-publish
                  N   X    N   D   P    N   D   P
     old client
     pull
      N           -   X/X  -   X/D X/P  -   X/D X/P
      X           -   X/X  -   X/D X/P  -   X/D X/P
     push
      X           X/X X/X  X/P X/P X/P  X/D X/D X/P
     new client
     pull
      N           -   P/X  -   P/D P/P  -   D/D P/P
      D           -   P/X  -   P/D P/P  -   D/D P/P
      P           -   P/X  -   P/D P/P  -   P/D P/P
     push
      D           P/X P/X  P/P P/P P/P  D/D D/D P/P
      P           P/X P/X  P/P P/P P/P  P/P P/P P/P
 
 Legend:
 
     A/B = final state on client / state on server
 
     * N = new/not present,
     * P = public,
     * D = draft,
     * X = not tracked (i.e., the old client or server has no internal
           way of recording the phase.)
 
     passive = only pushes
 
 
     A cell here can be read like this:
 
     "When a new client pushes a draft changeset (D) to a publishing
     server where it's not present (N), it's marked public on both
     sides (P/P)."
 
 Note: old client behave as a publishing server with draft only content
 - other people see it as public
 - content is pushed as draft
 
 """
 
 import errno
 from node import nullid, nullrev, bin, hex, short
 from i18n import _
 import util, error
 
 allphases = public, draft, secret = range(3)
 trackedphases = allphases[1:]
 phasenames = ['public', 'draft', 'secret']
 
 def _readroots(repo, phasedefaults=None):
     """Read phase roots from disk
 
     phasedefaults is a list of fn(repo, roots) callable, which are
     executed if the phase roots file does not exist. When phases are
     being initialized on an existing repository, this could be used to
     set selected changesets phase to something else than public.
 
     Return (roots, dirty) where dirty is true if roots differ from
     what is being stored.
     """
     repo = repo.unfiltered()
     dirty = False
     roots = [set() for i in allphases]
     try:
         f = repo.sopener('phaseroots')
         try:
             for line in f:
                 phase, nh = line.split()
                 roots[int(phase)].add(bin(nh))
         finally:
             f.close()
     except IOError, inst:
         if inst.errno != errno.ENOENT:
             raise
         if phasedefaults:
             for f in phasedefaults:
                 roots = f(repo, roots)
         dirty = True
     return roots, dirty
 
 class phasecache(object):
     def __init__(self, repo, phasedefaults, _load=True):
         if _load:
             # Cheap trick to allow shallow-copy without copy module
             self.phaseroots, self.dirty = _readroots(repo, phasedefaults)
             self._phaserevs = None
             self.filterunknown(repo)
             self.opener = repo.sopener
 
     def copy(self):
         # Shallow copy meant to ensure isolation in
         # advance/retractboundary(), nothing more.
         ph = phasecache(None, None, _load=False)
         ph.phaseroots = self.phaseroots[:]
         ph.dirty = self.dirty
         ph.opener = self.opener
         ph._phaserevs = self._phaserevs
         return ph
 
     def replace(self, phcache):
         for a in 'phaseroots dirty opener _phaserevs'.split():
             setattr(self, a, getattr(phcache, a))
 
     def getphaserevs(self, repo, rebuild=False):
         if rebuild or self._phaserevs is None:
             repo = repo.unfiltered()
             revs = [public] * len(repo.changelog)
             for phase in trackedphases:
                 roots = map(repo.changelog.rev, self.phaseroots[phase])
                 if roots:
                     for rev in roots:
                         revs[rev] = phase
                     for rev in repo.changelog.descendants(roots):
                         revs[rev] = phase
             self._phaserevs = revs
         return self._phaserevs
 
     def phase(self, repo, rev):
         # We need a repo argument here to be able to build _phaserevs
         # if necessary. The repository instance is not stored in
         # phasecache to avoid reference cycles. The changelog instance
         # is not stored because it is a filecache() property and can
         # be replaced without us being notified.
         if rev == nullrev:
             return public
         if self._phaserevs is None or rev >= len(self._phaserevs):
             self._phaserevs = self.getphaserevs(repo, rebuild=True)
         return self._phaserevs[rev]
 
     def write(self):
         if not self.dirty:
             return
         f = self.opener('phaseroots', 'w', atomictemp=True)
         try:
             for phase, roots in enumerate(self.phaseroots):
                 for h in roots:
                     f.write('%i %s\n' % (phase, hex(h)))
         finally:
             f.close()
         self.dirty = False
 
     def _updateroots(self, phase, newroots):
         self.phaseroots[phase] = newroots
         self._phaserevs = None
         self.dirty = True
 
     def advanceboundary(self, repo, targetphase, nodes):
         # Be careful to preserve shallow-copied values: do not update
         # phaseroots values, replace them.
 
         repo = repo.unfiltered()
         delroots = [] # set of root deleted by this path
         for phase in xrange(targetphase + 1, len(allphases)):
             # filter nodes that are not in a compatible phase already
             nodes = [n for n in nodes
                      if self.phase(repo, repo[n].rev()) >= phase]
             if not nodes:
                 break # no roots to move anymore
             olds = self.phaseroots[phase]
             roots = set(ctx.node() for ctx in repo.set(
                     'roots((%ln::) - (%ln::%ln))', olds, olds, nodes))
             if olds != roots:
                 self._updateroots(phase, roots)
                 # some roots may need to be declared for lower phases
                 delroots.extend(olds - roots)
             # declare deleted root in the target phase
             if targetphase != 0:
                 self.retractboundary(repo, targetphase, delroots)
         repo.invalidatevolatilesets()
 
     def retractboundary(self, repo, targetphase, nodes):
         # Be careful to preserve shallow-copied values: do not update
         # phaseroots values, replace them.
 
         repo = repo.unfiltered()
         currentroots = self.phaseroots[targetphase]
         newroots = [n for n in nodes
                     if self.phase(repo, repo[n].rev()) < targetphase]
         if newroots:
             if nullid in newroots:
                 raise util.Abort(_('cannot change null revision phase'))
             currentroots = currentroots.copy()
             currentroots.update(newroots)
             ctxs = repo.set('roots(%ln::)', currentroots)
             currentroots.intersection_update(ctx.node() for ctx in ctxs)
             self._updateroots(targetphase, currentroots)
         repo.invalidatevolatilesets()
 
     def filterunknown(self, repo):
         """remove unknown nodes from the phase boundary
 
         Nothing is lost as unknown nodes only hold data for their descendants.
         """
         filtered = False
         nodemap = repo.changelog.nodemap # to filter unknown nodes
         for phase, nodes in enumerate(self.phaseroots):
             missing = [node for node in nodes if node not in nodemap]
             if missing:
                 for mnode in missing:
                     repo.ui.debug(
                         'removing unknown node %s from %i-phase boundary\n'
                         % (short(mnode), phase))
                 nodes.symmetric_difference_update(missing)
                 filtered = True
         if filtered:
             self.dirty = True
+        # filterunknown is called by repo.destroyed, we may have no changes in
+        # root but phaserevs contents is certainly invalide (or at least we
+        # have not proper way to check that. related to issue 3858.
+        #
+        # The other caller is __init__ that have no _phaserevs initialized
+        # anyway. If this change we should consider adding a dedicated
+        # "destroyed" function to phasecache or a proper cache key mechanisme
+        # (see branchmap one)
             self._phaserevs = None
 
 def advanceboundary(repo, targetphase, nodes):
     """Add nodes to a phase changing other nodes phases if necessary.
 
     This function move boundary *forward* this means that all nodes
     are set in the target phase or kept in a *lower* phase.
 
     Simplify boundary to contains phase roots only."""
     phcache = repo._phasecache.copy()
     phcache.advanceboundary(repo, targetphase, nodes)
     repo._phasecache.replace(phcache)
 
 def retractboundary(repo, targetphase, nodes):
     """Set nodes back to a phase changing other nodes phases if
     necessary.
 
     This function move boundary *backward* this means that all nodes
     are set in the target phase or kept in a *higher* phase.
 
     Simplify boundary to contains phase roots only."""
     phcache = repo._phasecache.copy()
     phcache.retractboundary(repo, targetphase, nodes)
     repo._phasecache.replace(phcache)
 
 def listphases(repo):
     """List phases root for serialization over pushkey"""
     keys = {}
     value = '%i' % draft
     for root in repo._phasecache.phaseroots[draft]:
         keys[hex(root)] = value
 
     if repo.ui.configbool('phases', 'publish', True):
         # Add an extra data to let remote know we are a publishing
         # repo. Publishing repo can't just pretend they are old repo.
         # When pushing to a publishing repo, the client still need to
         # push phase boundary
         #
         # Push do not only push changeset. It also push phase data.
         # New phase data may apply to common changeset which won't be
         # push (as they are common). Here is a very simple example:
         #
         # 1) repo A push changeset X as draft to repo B
         # 2) repo B make changeset X public
         # 3) repo B push to repo A. X is not pushed but the data that
         #    X as now public should
         #
         # The server can't handle it on it's own as it has no idea of
         # client phase data.
         keys['publishing'] = 'True'
     return keys
 
 def pushphase(repo, nhex, oldphasestr, newphasestr):
     """List phases root for serialization over pushkey"""
     repo = repo.unfiltered()
     lock = repo.lock()
     try:
         currentphase = repo[nhex].phase()
         newphase = abs(int(newphasestr)) # let's avoid negative index surprise
         oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise
         if currentphase == oldphase and newphase < oldphase:
             advanceboundary(repo, newphase, [bin(nhex)])
             return 1
         elif currentphase == newphase:
             # raced, but got correct result
             return 1
         else:
             return 0
     finally:
         lock.release()
 
 def analyzeremotephases(repo, subset, roots):
     """Compute phases heads and root in a subset of node from root dict
 
     * subset is heads of the subset
     * roots is {<nodeid> => phase} mapping. key and value are string.
 
     Accept unknown element input
     """
     repo = repo.unfiltered()
     # build list from dictionary
     draftroots = []
     nodemap = repo.changelog.nodemap # to filter unknown nodes
     for nhex, phase in roots.iteritems():
         if nhex == 'publishing': # ignore data related to publish option
             continue
         node = bin(nhex)
         phase = int(phase)
         if phase == 0:
             if node != nullid:
                 repo.ui.warn(_('ignoring inconsistent public root'
                                ' from remote: %s\n') % nhex)
         elif phase == 1:
             if node in nodemap:
                 draftroots.append(node)
         else:
             repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
                          % (phase, nhex))
     # compute heads
     publicheads = newheads(repo, subset, draftroots)
     return publicheads, draftroots
 
 def newheads(repo, heads, roots):
     """compute new head of a subset minus another
 
     * `heads`: define the first subset
     * `roots`: define the second we subtract from the first"""
     repo = repo.unfiltered()
     revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
                       heads, roots, roots, heads)
     return [c.node() for c in revset]
 
 
 def newcommitphase(ui):
     """helper to get the target phase of new commit
 
     Handle all possible values for the phases.new-commit options.
 
     """
     v = ui.config('phases', 'new-commit', draft)
     try:
         return phasenames.index(v)
     except ValueError:
         try:
             return int(v)
         except ValueError:
             msg = _("phases.new-commit: not a valid phase name ('%s')")
             raise error.ConfigError(msg % v)
 
 def hassecret(repo):
     """utility function that check if a repo have any secret changeset."""
     return bool(repo._phasecache.phaseroots[2])

tests/test-rebase-cache.t

@@ -1,387 +1,496 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > rebase=
   > mq=
   > 
   > [phases]
   > publish=False
   > 
   > [alias]
   > tglog  = log -G --template "{rev}: '{desc}' {branches}\n"
   > theads = heads --template "{rev}: '{desc}' {branches}\n"
   > EOF
 
   $ hg init a
   $ cd a
 
   $ echo a > a
   $ hg ci -Am A
   adding a
 
   $ hg branch branch1
   marked working directory as branch branch1
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch1'
 
   $ echo b > b
   $ hg ci -Am B
   adding b
 
   $ hg up -q 0
 
   $ hg branch branch2
   marked working directory as branch branch2
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch2'
 
   $ echo c > C
   $ hg ci -Am C
   adding C
 
   $ hg up -q 2
 
   $ hg branch -f branch2
   marked working directory as branch branch2
   (branches are permanent and global, did you want a bookmark?)
   $ echo d > d
   $ hg ci -Am D
   adding d
   created new head
 
   $ echo e > e
   $ hg ci -Am E
   adding e
 
   $ hg update default
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
   $ hg branch branch3
   marked working directory as branch branch3
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch3'
 
   $ echo f > f
   $ hg ci -Am F
   adding f
 
   $ cd ..
 
 
 Rebase part of branch2 (5-6) onto branch3 (8):
 
   $ hg clone -q -u . a a1
   $ cd a1
 
   $ hg tglog
   @  8: 'F' branch3
   |
   o  7: 'branch3' branch3
   |
   | o  6: 'E' branch2
   | |
   | o  5: 'D' branch2
   | |
   | | o  4: 'C' branch2
   | | |
   +---o  3: 'branch2' branch2
   | |
   | o  2: 'B' branch1
   | |
   | o  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg branches
   branch3                        8:4666b71e8e32
   branch2                        6:5097051d331d
   branch1                        2:0a03079c47fd (inactive)
   default                        0:1994f17a630e (inactive)
 
   $ hg theads
   8: 'F' branch3
   6: 'E' branch2
   4: 'C' branch2
   2: 'B' branch1
   0: 'A' 
 
   $ hg rebase -s 5 -d 8
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg branches
   branch3                        8:466cdfb14b62
   branch2                        4:e4fdb121d036
   branch1                        2:0a03079c47fd
   default                        0:1994f17a630e (inactive)
 
   $ hg theads
   8: 'E' branch3
   4: 'C' branch2
   2: 'B' branch1
   0: 'A' 
 
   $ hg tglog
   @  8: 'E' branch3
   |
   o  7: 'D' branch3
   |
   o  6: 'F' branch3
   |
   o  5: 'branch3' branch3
   |
   | o  4: 'C' branch2
   | |
   | o  3: 'branch2' branch2
   |/
   | o  2: 'B' branch1
   | |
   | o  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ cd ..
 
 
 Rebase head of branch3 (8) onto branch2 (6):
 
   $ hg clone -q -u . a a2
   $ cd a2
 
   $ hg tglog
   @  8: 'F' branch3
   |
   o  7: 'branch3' branch3
   |
   | o  6: 'E' branch2
   | |
   | o  5: 'D' branch2
   | |
   | | o  4: 'C' branch2
   | | |
   +---o  3: 'branch2' branch2
   | |
   | o  2: 'B' branch1
   | |
   | o  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg rebase -s 8 -d 6
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg branches
   branch2                        8:6b4bdc1b5ac0
   branch3                        7:653b9feb4616
   branch1                        2:0a03079c47fd (inactive)
   default                        0:1994f17a630e (inactive)
 
   $ hg theads
   8: 'F' branch2
   7: 'branch3' branch3
   4: 'C' branch2
   2: 'B' branch1
   0: 'A' 
 
   $ hg tglog
   @  8: 'F' branch2
   |
   | o  7: 'branch3' branch3
   | |
   o |  6: 'E' branch2
   | |
   o |  5: 'D' branch2
   | |
   | | o  4: 'C' branch2
   | | |
   | | o  3: 'branch2' branch2
   | |/
   o |  2: 'B' branch1
   | |
   o |  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg verify -q
 
   $ cd ..
 
 
 Rebase entire branch3 (7-8) onto branch2 (6):
 
   $ hg clone -q -u . a a3
   $ cd a3
 
   $ hg tglog
   @  8: 'F' branch3
   |
   o  7: 'branch3' branch3
   |
   | o  6: 'E' branch2
   | |
   | o  5: 'D' branch2
   | |
   | | o  4: 'C' branch2
   | | |
   +---o  3: 'branch2' branch2
   | |
   | o  2: 'B' branch1
   | |
   | o  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg rebase -s 7 -d 6
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg branches
   branch2                        7:6b4bdc1b5ac0
   branch1                        2:0a03079c47fd (inactive)
   default                        0:1994f17a630e (inactive)
 
   $ hg theads
   7: 'F' branch2
   4: 'C' branch2
   2: 'B' branch1
   0: 'A' 
 
   $ hg tglog
   @  7: 'F' branch2
   |
   o  6: 'E' branch2
   |
   o  5: 'D' branch2
   |
   | o  4: 'C' branch2
   | |
   | o  3: 'branch2' branch2
   | |
   o |  2: 'B' branch1
   | |
   o |  1: 'branch1' branch1
   |/
   o  0: 'A'
   
   $ hg verify -q
 
 Stripping multiple branches in one go bypasses the fast-case code to
 update the branch cache.
 
   $ hg strip 2
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   o  3: 'C' branch2
   |
   o  2: 'branch2' branch2
   |
   | @  1: 'branch1' branch1
   |/
   o  0: 'A'
   
 
   $ hg branches
   branch2                        3:e4fdb121d036
   branch1                        1:63379ac49655
   default                        0:1994f17a630e (inactive)
 
   $ hg theads
   3: 'C' branch2
   1: 'branch1' branch1
   0: 'A' 
 
 Fast path branchcache code should not be invoked if branches stripped is not
 the same as branches remaining.
 
   $ hg init b
   $ cd b
 
   $ hg branch branch1
   marked working directory as branch branch1
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch1'
 
   $ hg branch branch2
   marked working directory as branch branch2
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m 'branch2'
 
   $ hg branch -f branch1
   marked working directory as branch branch1
   (branches are permanent and global, did you want a bookmark?)
 
   $ echo a > A
   $ hg ci -Am A
   adding A
   created new head
 
   $ hg tglog
   @  2: 'A' branch1
   |
   o  1: 'branch2' branch2
   |
   o  0: 'branch1' branch1
   
 
   $ hg theads
   2: 'A' branch1
   1: 'branch2' branch2
 
   $ hg strip 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg theads
   1: 'branch2' branch2
   0: 'branch1' branch1
 
 
 Make sure requesting to strip a revision already stripped does not confuse things.
 Try both orders.
 
   $ cd ..
 
   $ hg init c
   $ cd c
 
   $ echo a > a
   $ hg ci -Am A
   adding a
   $ echo b > b
   $ hg ci -Am B
   adding b
   $ echo c > c
   $ hg ci -Am C
   adding c
   $ echo d > d
   $ hg ci -Am D
   adding d
   $ echo e > e
   $ hg ci -Am E
   adding e
 
   $ hg tglog
   @  4: 'E'
   |
   o  3: 'D'
   |
   o  2: 'C'
   |
   o  1: 'B'
   |
   o  0: 'A'
   
 
   $ hg strip 3 4
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg theads
   2: 'C' 
 
   $ hg strip 2 1
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg theads
   0: 'A' 
+
+Make sure rebase does not break for phase/filter related reason
+----------------------------------------------------------------
+(issue3858)
+
+  $ cd ..
+
+  $ cat >> $HGRCPATH << EOF
+  > [ui]
+  > logtemplate={rev} {desc} {phase}\n
+  > EOF
+  $ cat $HGRCPATH
+  [ui]
+  slash = True
+  interactive = False
+  [defaults]
+  backout = -d "0 0"
+  commit = -d "0 0"
+  tag = -d "0 0"
+  [extensions]
+  graphlog=
+  rebase=
+  mq=
+  
+  [phases]
+  publish=False
+  
+  [alias]
+  tglog  = log -G --template "{rev}: '{desc}' {branches}\n"
+  theads = heads --template "{rev}: '{desc}' {branches}\n"
+  [ui]
+  logtemplate={rev} {desc} {phase}\n
+
+
+  $ hg init c4
+  $ cd c4
+
+  $ echo a > a
+  $ hg ci -Am A
+  adding a
+  $ echo b > b
+  $ hg ci -Am B
+  adding b
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo c > c
+  $ hg ci -Am C
+  adding c
+  created new head
+  $ hg up 1
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -m d
+  $ hg up 2
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo e > e
+  $ hg ci -Am E
+  adding e
+  created new head
+  $ hg merge 3
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci -m F
+  $ hg up 3
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo g > g
+  $ hg ci -Am G
+  adding g
+  created new head
+  $ echo h > h
+  $ hg ci -Am H
+  adding h
+  $ hg up 5
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ echo i > i
+  $ hg ci -Am I
+  adding i
+
+Turn most changeset public
+
+  $ hg ph -p 7
+
+  $ hg heads
+  8 I draft
+  7 H public
+  $ hg log -G
+  @  8 I draft
+  |
+  | o  7 H public
+  | |
+  | o  6 G public
+  | |
+  o |  5 F draft
+  |\|
+  o |  4 E draft
+  | |
+  | o  3 d public
+  |/|
+  o |  2 C public
+  | |
+  | o  1 B public
+  |/
+  o  0 A public
+  
+
+  $ hg rebase --dest 7 --source 5
+  saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob)