strip: hide unbundle messages by default

Unbundling is an internal implementation detail for strip, only show
them with --verbose.

mercurial/repair.py

@@ -1,154 +1,159 b''
 # repair.py - functions for repository repair for mercurial
 #
 # Copyright 2005, 2006 Chris Mason <[e-mail]>
 # Copyright 2007 Matt Mackall
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import changegroup
 from node import nullrev, short
 from i18n import _
 import os
 
 def _bundle(repo, bases, heads, node, suffix, extranodes=None):
     """create a bundle with the specified revisions as a backup"""
     cg = repo.changegroupsubset(bases, heads, 'strip', extranodes)
     backupdir = repo.join("strip-backup")
     if not os.path.isdir(backupdir):
         os.mkdir(backupdir)
     name = os.path.join(backupdir, "%s-%s" % (short(node), suffix))
     return changegroup.writebundle(cg, name, "HG10BZ")
 
 def _collectfiles(repo, striprev):
     """find out the filelogs affected by the strip"""
     files = set()
 
     for x in xrange(striprev, len(repo)):
         files.update(repo[x].files())
 
     return sorted(files)
 
 def _collectextranodes(repo, files, link):
     """return the nodes that have to be saved before the strip"""
     def collectone(revlog):
         extra = []
         startrev = count = len(revlog)
         # find the truncation point of the revlog
         for i in xrange(count):
             lrev = revlog.linkrev(i)
             if lrev >= link:
                 startrev = i + 1
                 break
 
         # see if any revision after that point has a linkrev less than link
         # (we have to manually save these guys)
         for i in xrange(startrev, count):
             node = revlog.node(i)
             lrev = revlog.linkrev(i)
             if lrev < link:
                 extra.append((node, cl.node(lrev)))
 
         return extra
 
     extranodes = {}
     cl = repo.changelog
     extra = collectone(repo.manifest)
     if extra:
         extranodes[1] = extra
     for fname in files:
         f = repo.file(fname)
         extra = collectone(f)
         if extra:
             extranodes[fname] = extra
 
     return extranodes
 
 def strip(ui, repo, node, backup="all"):
     cl = repo.changelog
     # TODO delete the undo files, and handle undo of merge sets
     striprev = cl.rev(node)
 
     # Some revisions with rev > striprev may not be descendants of striprev.
     # We have to find these revisions and put them in a bundle, so that
     # we can restore them after the truncations.
     # To create the bundle we use repo.changegroupsubset which requires
     # the list of heads and bases of the set of interesting revisions.
     # (head = revision in the set that has no descendant in the set;
     #  base = revision in the set that has no ancestor in the set)
     tostrip = set((striprev,))
     saveheads = set()
     savebases = []
     for r in xrange(striprev + 1, len(cl)):
         parents = cl.parentrevs(r)
         if parents[0] in tostrip or parents[1] in tostrip:
             # r is a descendant of striprev
             tostrip.add(r)
             # if this is a merge and one of the parents does not descend
             # from striprev, mark that parent as a savehead.
             if parents[1] != nullrev:
                 for p in parents:
                     if p not in tostrip and p > striprev:
                         saveheads.add(p)
         else:
             # if no parents of this revision will be stripped, mark it as
             # a savebase
             if parents[0] < striprev and parents[1] < striprev:
                 savebases.append(cl.node(r))
 
             saveheads.difference_update(parents)
             saveheads.add(r)
 
     saveheads = [cl.node(r) for r in saveheads]
     files = _collectfiles(repo, striprev)
 
     extranodes = _collectextranodes(repo, files, striprev)
 
     # create a changegroup for all the branches we need to keep
     backupfile = None
     if backup == "all":
         backupfile = _bundle(repo, [node], cl.heads(), node, 'backup')
         repo.ui.status(_("saved backup bundle to %s\n") % backupfile)
     if saveheads or extranodes:
         chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
                             extranodes)
 
     mfst = repo.manifest
 
     tr = repo.transaction("strip")
     offset = len(tr.entries)
 
     try:
         tr.startgroup()
         cl.strip(striprev, tr)
         mfst.strip(striprev, tr)
         for fn in files:
             repo.file(fn).strip(striprev, tr)
         tr.endgroup()
 
         try:
             for i in xrange(offset, len(tr.entries)):
                 file, troffset, ignore = tr.entries[i]
                 repo.sopener(file, 'a').truncate(troffset)
             tr.close()
         except:
             tr.abort()
             raise
 
         if saveheads or extranodes:
-            ui.status(_("adding branch\n"))
+            ui.note(_("adding branch\n"))
             f = open(chgrpfile, "rb")
             gen = changegroup.readbundle(f, chgrpfile)
+            if not repo.ui.verbose:
+                # silence internal shuffling chatter
+                repo.ui.pushbuffer()
             repo.addchangegroup(gen, 'strip', 'bundle:' + chgrpfile, True)
+            if not repo.ui.verbose:
+                repo.ui.popbuffer()
             f.close()
             if backup != "strip":
                 os.unlink(chgrpfile)
     except:
         if backupfile:
             ui.warn("strip failed, full bundle stored in '%s'\n" % backupfile)
         elif saveheads:
             ui.warn("strip failed, partial bundle stored in '%s'\n"
                     % chgrpfile)
         raise
 
     repo.destroyed()

tests/test-bookmarks-rebase.out

@@ -1,44 +1,39 b''
 % initialize repository
 adding a
 adding b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 adding d
 % bookmark list
  * two                       3:2ae46b1d99a7
    one                       1:925d80f479bb
 % rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (-1 heads)
 rebase completed
 changeset:   3:9163974d1cb5
 tag:         one
 tag:         tip
 tag:         two
 parent:      1:925d80f479bb
 parent:      2:db815d6d32e6
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     3
 
 changeset:   2:db815d6d32e6
 parent:      0:f7b1eb17ad24
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     2
 
 changeset:   1:925d80f479bb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     1
 
 changeset:   0:f7b1eb17ad24
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     0
 

tests/test-bookmarks-strip.out

@@ -1,23 +1,18 b''
 % add file
 adding qqq.txt
 % commit first revision
 % set bookmark
 % commit second revision
 % set bookmark
 % update to -2
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % commit new head
 created new head
 % bookmarks updated?
    test                      1:16b24da7e457
    test2                     1:16b24da7e457
 % strip to revision 1
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 % list bookmarks
  * test                      1:9f1b7e78eff8
  * test2                     1:9f1b7e78eff8

tests/test-mq-qrefresh.out

@@ -1,300 +1,295 b''
 % init
 % commit
 adding 1/base
 adding 2/base
 % qnew mqbase
 % qrefresh
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 # HG changeset patch
 # Parent 
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh 1
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 # HG changeset patch
 # Parent 
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh . in subdir
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 # HG changeset patch
 # Parent 
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh in hg-root again
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 # HG changeset patch
 # Parent 
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 
 % qrefresh --short tests:
 % - add 1/base and 2/base one by one
 % -- qdiff output
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf orphanchild
 --- /dev/null
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
 % -- patch file content
 # HG changeset patch
 # Parent 
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 A orphanchild
 ? base
 % -- diff shows what is not in patch
 diff
 --- /dev/null
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
 % - before starting exclusive tests
 1/base
 2/base
 % - exclude 2/base
 1/base
 % -- status shows 2/base as dirty
 M 2/base
 A orphanchild
 ? base
 % - remove 1/base and add 2/base again but not orphanchild
 2/base
 % - add 1/base with include filter - and thus remove 2/base from patch
 1/base
 
 % create test repo
 adding a
 % capture changes
 diff --git a/a b/ab
 copy from a
 copy to ab
 --- a/a
 +++ b/ab
 @@ -1,1 +1,2 @@
  a
 +b
 diff --git a/a b/ac
 copy from a
 copy to ac
 --- a/a
 +++ b/ac
 @@ -1,1 +1,2 @@
  a
 +c
 % refresh and check changes again
 diff --git a/a b/ab
 copy from a
 copy to ab
 --- a/a
 +++ b/ab
 @@ -1,1 +1,2 @@
  a
 +b
 diff --git a/a b/ac
 copy from a
 copy to ac
 --- a/a
 +++ b/ac
 @@ -1,1 +1,2 @@
  a
 +c
 % issue1441 without git patches
 diff -r 000000000000 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a
 % issue2025: qrefresh does not honor filtering options when tip != qtip
 % refresh with tip != qtip
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 % status after refresh
 M a
 % b after refresh
 b
 b
 % patch file after refresh
 # HG changeset patch
 # Parent 
 
 diff -r 1a60229be7ac b
 --- a/b
 +++ b/b
 @@ -1,1 +1,2 @@
  b
 +b
 % issue1441 with git patches
 diff --git a/b b/b
 new file mode 100644
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a

tests/test-mq-strip.out

@@ -1,172 +1,167 b''
 adding bar
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 changeset:   3:65bd5f99a4a3
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   2:264128213d29
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:9ab35a2d17cb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 4
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
 % after update 4, strip 4
 changeset:   3:65bd5f99a4a3
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 3
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
 % after update 4, strip 3
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 1, strip 4
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 saved backup bundle to 
 % after update 1, strip 4
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 2
 changeset:   4:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
 % after update 4, strip 2
 changeset:   3:443431ffac4f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % before update 4, strip 1
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
 % after update 4, strip 1
 changeset:   0:9ab35a2d17cb
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % before update null, strip 4
 saved backup bundle to 
 % after update null, strip 4
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 changeset:   3:443431ffac4f
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     e
 
 changeset:   2:65bd5f99a4a3
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:9ab35a2d17cb
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % before strip of merge parent
 changeset:   2:65bd5f99a4a3
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
 changeset:   4:264128213d29
 tag:         tip
 parent:      1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     c
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
 % after strip of merge parent
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 

tests/test-mq.out

@@ -1,650 +1,635 b''
 % help
 mq extension - manage a stack of patches
 
 This extension lets you work with a stack of patches in a Mercurial
 repository. It manages two stacks of patches - all known patches, and applied
 patches (subset of known patches).
 
 Known patches are represented as patch files in the .hg/patches directory.
 Applied patches are both patch files and changesets.
 
 Common tasks (use "hg help command" for more details):
 
   create new patch                          qnew
   import existing patch                     qimport
 
   print patch series                        qseries
   print applied patches                     qapplied
 
   add known patch to applied stack          qpush
   remove patch from applied stack           qpop
   refresh contents of top applied patch     qrefresh
 
 By default, mq will automatically use git patches when required to avoid
 losing file mode changes, copy records, binary files or empty files creations
 or deletions. This behaviour can be configured with:
 
   [mq]
   git = auto/keep/yes/no
 
 If set to 'keep', mq will obey the [diff] section configuration while
 preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
 will override the [diff] section and always generate git or regular patches,
 possibly losing data in the second case.
 
 list of commands:
 
  qapplied     print the patches already applied
  qclone       clone main and patch repository at same time
  qdelete      remove patches from queue
  qdiff        diff of the current patch and subsequent modifications
  qfinish      move applied patches into repository history
  qfold        fold the named patches into the current patch
  qgoto        push or pop patches until named patch is at top of stack
  qguard       set or print guards for a patch
  qheader      print the header of the topmost or specified patch
  qimport      import a patch
  qnew         create a new patch
  qnext        print the name of the next patch
  qpop         pop the current patch off the stack
  qprev        print the name of the previous patch
  qpush        push the next patch onto the stack
  qrefresh     update the current patch
  qrename      rename a patch
  qselect      set or print guarded patches to push
  qseries      print the entire series file
  qtop         print the name of the current patch
  qunapplied   print the patches not yet applied
  strip        strip a changeset and all its descendants from the repository
 
 use "hg -v help mq" to show aliases and global options
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b/z
 % qinit
 % -R qinit
 % qinit -c
 A .hgignore
 A series
 % qinit; qinit -c
   .hgignore:
 ^\.hg
 ^\.mq
 syntax: glob
 status
 guards
   series:
 abort: repository already exists!
 % qinit; <stuff>; qinit -c
 adding .hg/patches/A
 adding .hg/patches/B
 A .hgignore
 A A
 A B
 A series
   .hgignore:
 status
 bleh
   series:
 A
 B
 % init --mq without repo
 abort: There is no Mercurial repository here (.hg not found)
 % init --mq with repo path
 ok
 % init --mq with nonexistent directory
 abort: repository nonexistentdir not found!
 % init --mq with bundle (non "local")
 abort: only a local queue repository may be initialized
 % qrefresh
 foo bar
 
 diff -r  xa
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % empty qrefresh
 revision:
 patch:
 foo bar
 
 working dir diff:
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 % qpop
 popping test.patch
 patch queue now empty
 % qpush with dump of tag cache
 .hg/tags.cache (pre qpush):
 1
 
 applying test.patch
 now at: test.patch
 .hg/tags.cache (post qpush):
 2
 
 % pop/push outside repo
 popping test.patch
 patch queue now empty
 applying test.patch
 now at: test.patch
 % qrefresh in subdir
 % pop/push -a in subdir
 popping test2.patch
 popping test.patch
 patch queue now empty
 applying test.patch
 applying test2.patch
 now at: test2.patch
 % qseries
 test.patch
 test2.patch
 0 A test.patch: f...
 1 A test2.patch: 
 popping test2.patch
 now at: test.patch
 0 A test.patch: foo bar
 1 U test2.patch: 
 mq:     1 applied, 1 unapplied
 applying test2.patch
 now at: test2.patch
 mq:     2 applied
 % qapplied
 test.patch
 test2.patch
 % qtop
 test2.patch
 % prev
 test.patch
 % next
 all patches applied
 popping test2.patch
 now at: test.patch
 % commit should fail
 abort: cannot commit over an applied mq patch
 % push should fail
 pushing to ../../k
 abort: source has mq patches applied
 % import should fail
 abort: cannot import over an applied patch
 % import --no-commit should succeed
 applying ../../import.diff
 M a
 % qunapplied
 test2.patch
 % qpush/qpop with index
 applying test2.patch
 now at: test2.patch
 popping test2.patch
 popping test1b.patch
 now at: test.patch
 applying test1b.patch
 now at: test1b.patch
 applying test2.patch
 now at: test2.patch
 popping test2.patch
 now at: test1b.patch
 popping test1b.patch
 now at: test.patch
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
 % qpush --move
 popping test2.patch
 popping test1b.patch
 popping test.patch
 patch queue now empty
 applying test2.patch
 now at: test2.patch
 applying test1b.patch
 now at: test1b.patch
 applying test.patch
 now at: test.patch
 0 A test2.patch
 1 A test1b.patch
 2 A test.patch
 popping test.patch
 popping test1b.patch
 popping test2.patch
 patch queue now empty
 applying test.patch
 now at: test.patch
 applying test1b.patch
 now at: test1b.patch
 abort: patch bogus not in series
 abort: cannot push to a previous patch: test.patch
 applying test2.patch
 now at: test2.patch
 % pop, qapplied, qunapplied
 0 A test.patch
 1 A test1b.patch
 2 A test2.patch
 % qapplied -1 test.patch
 only one patch applied
 % qapplied -1 test1b.patch
 test.patch
 % qapplied -1 test2.patch
 test1b.patch
 % qapplied -1
 test1b.patch
 % qapplied
 test.patch
 test1b.patch
 test2.patch
 % qapplied test1b.patch
 test.patch
 test1b.patch
 % qunapplied -1
 all patches applied
 % qunapplied
 % popping
 popping test2.patch
 now at: test1b.patch
 % qunapplied -1
 test2.patch
 % qunapplied
 test2.patch
 % qunapplied test2.patch
 % qunapplied -1 test2.patch
 all patches applied
 % popping -a
 popping test1b.patch
 popping test.patch
 patch queue now empty
 % qapplied
 % qapplied -1
 no patches applied
 applying test.patch
 now at: test.patch
 % push should succeed
 popping test.patch
 patch queue now empty
 pushing to ../../k
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % qpush/qpop error codes
 applying test.patch
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
   % pops all patches and succeeds
 popping test2.patch
 popping test1b.patch
 popping test.patch
 patch queue now empty
   qpop -a succeeds
   % does nothing and succeeds
 no patches applied
   qpop -a succeeds
   % fails - nothing else to pop
 no patches applied
   qpop fails
   % pushes a patch and succeeds
 applying test.patch
 now at: test.patch
   qpush succeeds
   % pops a patch and succeeds
 popping test.patch
 patch queue now empty
   qpop succeeds
   % pushes up to test1b.patch and succeeds
 applying test.patch
 applying test1b.patch
 now at: test1b.patch
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpush: test1b.patch is already at the top
   qpush test1b.patch succeeds
   % does nothing and succeeds
 qpop: test1b.patch is already at the top
   qpop test1b.patch succeeds
   % fails - can't push to this patch
 abort: cannot push to a previous patch: test.patch
   qpush test.patch fails
   % fails - can't pop to this patch
 abort: patch test2.patch is not applied
   qpop test2.patch fails
   % pops up to test.patch and succeeds
 popping test1b.patch
 now at: test.patch
   qpop test.patch succeeds
   % pushes all patches and succeeds
 applying test1b.patch
 applying test2.patch
 now at: test2.patch
   qpush -a succeeds
   % does nothing and succeeds
 all patches are currently applied
   qpush -a succeeds
   % fails - nothing else to push
 patch series already fully applied
   qpush fails
   % does nothing and succeeds
 qpush: test2.patch is already at the top
   qpush test2.patch succeeds
 % strip
 adding x
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 % strip with local changes, should complain
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 abort: local changes found
 % --force strip with local changes
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
 % cd b; hg qrefresh
 adding a
 foo
 
 diff -r cb9a9f314b8b a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +a
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 % hg qrefresh .
 foo
 
 diff -r cb9a9f314b8b b/f
 --- /dev/null
 +++ b/b/f
 @@ -0,0 +1,1 @@
 +f
 M a
 % qpush failure
 popping bar
 popping foo
 patch queue now empty
 applying foo
 applying bar
 file foo already exists
 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
 patch failed, unable to continue (try -v)
 patch failed, rejects left in working dir
 errors during apply, please fix and refresh bar
 ? foo
 ? foo.rej
 % mq tags
 0 qparent
 1 foo qbase
 2 bar qtip tip
 % bad node in status
 popping bar
 now at: foo
 changeset:   0:cb9a9f314b8b
 mq status file refers to unknown node
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 mq status file refers to unknown node
 default                        0:cb9a9f314b8b
 abort: trying to pop unknown node
 new file
 
 diff --git a/new b/new
 new file mode 100755
 --- /dev/null
 +++ b/new
 @@ -0,0 +1,1 @@
 +foo
 copy file
 
 diff --git a/new b/copy
 copy from new
 copy to copy
 popping copy
 now at: new
 applying copy
 now at: copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 diff --git a/new b/copy
 copy from new
 copy to copy
 % test file addition in slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
 +++ b/bar
 @@ -0,0 +1,1 @@
 +bar
 diff --git a/foo b/baz
 rename from foo
 rename to baz
 2 baz (foo)
 diff --git a/bar b/bar
 diff --git a/foo b/baz
 % test file move chains in the slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 diff --git a/foo b/bleh
 rename from foo
 rename to bleh
 diff --git a/quux b/quux
 new file mode 100644
 --- /dev/null
 +++ b/quux
 @@ -0,0 +1,1 @@
 +bar
 3 bleh (foo)
 diff --git a/foo b/barney
 rename from foo
 rename to barney
 diff --git a/fred b/fred
 new file mode 100644
 --- /dev/null
 +++ b/fred
 @@ -0,0 +1,1 @@
 +bar
 3 barney (foo)
 % refresh omitting an added file
 C newfile
 A newfile
 popping baz
 now at: bar
 % create a git patch
 diff --git a/alexander b/alexander
 % create a git binary patch
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 diff --git a/bucephalus b/bucephalus
 % check binary patches can be popped and pushed
 popping addbucephalus
 now at: addalexander
 applying addbucephalus
 now at: addbucephalus
 8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
 % strip again
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 changeset:   3:99615015637b
 tag:         tip
 parent:      2:20cbbe65cff7
 parent:      1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     merge
 
 changeset:   2:20cbbe65cff7
 parent:      0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   1:d2871fc282d4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 1
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 changeset:   1:20cbbe65cff7
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo 2
 
 changeset:   0:53245c60e682
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     add foo
 
 % qclone
 abort: versioned patch repository not found (see init --mq)
 adding .hg/patches/patch1
 main repo:
     rev 1: change foo
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 popping patch1
 patch queue now empty
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 main repo:
     rev 0: add foo
 patch repo:
     rev 0: checkpoint
 % test applying on an empty file (issue 1033)
 adding a
 popping changea
 patch queue now empty
 applying changea
 now at: changea
 % test qpush with --force, issue1087
 adding bye.txt
 adding hello.txt
 popping empty
 patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
 patch empty is empty
 now at: empty
 diff -r bf5fc3f07a0a hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,2 @@
  hello
 +world
 changeset:   1:bf5fc3f07a0a
 tag:         empty
 tag:         qbase
 tag:         qtip
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     imported patch empty
 
 
 popping empty
 patch queue now empty
 % qpush should fail, local changes
 abort: local changes found, refresh first
 % apply force, should discard changes in hello, but not bye
 applying empty
 now at: empty
 M bye.txt
 diff -r ba252371dbc1 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 bye.txt
 --- a/bye.txt
 +++ b/bye.txt
 @@ -1,1 +1,2 @@
  bye
 +universe
 diff -r 9ecee4f634e3 hello.txt
 --- a/hello.txt
 +++ b/hello.txt
 @@ -1,1 +1,3 @@
  hello
 +world
 +universe
 % test popping revisions not in working dir ancestry
 0 A empty
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 popping empty
 patch queue now empty
 % test popping must remove files added in subdirectories first
 popping rename-dir
 patch queue now empty

tests/test-rebase-cache.out

@@ -1,186 +1,171 b''
 
 @  8:c11d5b3e9c00 F branch: branch3
 |
 o  7:33c9da881988 Branch3 branch: branch3
 |
 | o  6:0e4064ab11a3 E branch: branch2
 | |
 | o  5:5ac035cb5d8f D branch: branch2
 | |
 | | o  4:8e66061486ee C branch: branch2
 | | |
 +---o  3:99567862abbe Branch2 branch: branch2
 | |
 | o  2:65a26a4d12f6 B branch: branch1
 | |
 | o  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 
 
 % Branches
 branch3                        8:c11d5b3e9c00
 branch2                        6:0e4064ab11a3
 branch1                        2:65a26a4d12f6 (inactive)
 default                        0:1994f17a630e (inactive)
 
 % Heads
 8:c11d5b3e9c00 F branch: branch3
 6:0e4064ab11a3 E branch: branch2
 4:8e66061486ee C branch: branch2
 2:65a26a4d12f6 B branch: branch1
 0:1994f17a630e A branch: 
 
 % Rebase part of branch2 (5-6) onto branch3 (8)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 
 % Branches
 branch3                        8:c9bfa9beb84e
 branch2                        4:8e66061486ee
 branch1                        2:65a26a4d12f6
 default                        0:1994f17a630e (inactive)
 
 % Heads
 8:c9bfa9beb84e E branch: branch3
 4:8e66061486ee C branch: branch2
 2:65a26a4d12f6 B branch: branch1
 0:1994f17a630e A branch: 
 
 @  8:c9bfa9beb84e E branch: branch3
 |
 o  7:bf9037384081 D branch: branch3
 |
 o  6:c11d5b3e9c00 F branch: branch3
 |
 o  5:33c9da881988 Branch3 branch: branch3
 |
 | o  4:8e66061486ee C branch: branch2
 | |
 | o  3:99567862abbe Branch2 branch: branch2
 |/
 | o  2:65a26a4d12f6 B branch: branch1
 | |
 | o  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 
 
 % Rebase head of branch3 (8) onto branch2 (6)
 @  8:c11d5b3e9c00 F branch: branch3
 |
 o  7:33c9da881988 Branch3 branch: branch3
 |
 | o  6:0e4064ab11a3 E branch: branch2
 | |
 | o  5:5ac035cb5d8f D branch: branch2
 | |
 | | o  4:8e66061486ee C branch: branch2
 | | |
 +---o  3:99567862abbe Branch2 branch: branch2
 | |
 | o  2:65a26a4d12f6 B branch: branch1
 | |
 | o  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 
 % Branches
 branch2                        8:b44d3024f247
 branch3                        7:33c9da881988
 branch1                        2:65a26a4d12f6 (inactive)
 default                        0:1994f17a630e (inactive)
 
 % Heads
 8:b44d3024f247 F branch: branch2
 7:33c9da881988 Branch3 branch: branch3
 4:8e66061486ee C branch: branch2
 2:65a26a4d12f6 B branch: branch1
 0:1994f17a630e A branch: 
 
 @  8:b44d3024f247 F branch: branch2
 |
 | o  7:33c9da881988 Branch3 branch: branch3
 | |
 o |  6:0e4064ab11a3 E branch: branch2
 | |
 o |  5:5ac035cb5d8f D branch: branch2
 | |
 | | o  4:8e66061486ee C branch: branch2
 | | |
 | | o  3:99567862abbe Branch2 branch: branch2
 | |/
 o |  2:65a26a4d12f6 B branch: branch1
 | |
 o |  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 
 
 % Rebase entire branch3 (7-8) onto branch2 (6)
 @  8:c11d5b3e9c00 F branch: branch3
 |
 o  7:33c9da881988 Branch3 branch: branch3
 |
 | o  6:0e4064ab11a3 E branch: branch2
 | |
 | o  5:5ac035cb5d8f D branch: branch2
 | |
 | | o  4:8e66061486ee C branch: branch2
 | | |
 +---o  3:99567862abbe Branch2 branch: branch2
 | |
 | o  2:65a26a4d12f6 B branch: branch1
 | |
 | o  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 
 % Branches
 branch2                        7:b44d3024f247
 branch1                        2:65a26a4d12f6 (inactive)
 default                        0:1994f17a630e (inactive)
 
 % Heads
 7:b44d3024f247 F branch: branch2
 4:8e66061486ee C branch: branch2
 2:65a26a4d12f6 B branch: branch1
 0:1994f17a630e A branch: 
 
 @  7:b44d3024f247 F branch: branch2
 |
 o  6:0e4064ab11a3 E branch: branch2
 |
 o  5:5ac035cb5d8f D branch: branch2
 |
 | o  4:8e66061486ee C branch: branch2
 | |
 | o  3:99567862abbe Branch2 branch: branch2
 | |
 o |  2:65a26a4d12f6 B branch: branch1
 | |
 o |  1:0f3f3010ee16 Branch1 branch: branch1
 |/
 o  0:1994f17a630e A branch:
 

tests/test-rebase-check-restore.out

@@ -1,76 +1,71 b''
 
 % - Rebasing B onto E - check keep
 @  5:F:notdefault
 |
 | o  4:E:
 | |
 | o  3:D:
 |/
 | o  2:C:
 | |
 | o  1:B:
 |/
 o  0:A:
 
 warning: conflicts during merge.
 merging A failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 merging A
 
 % - Solve the conflict and go on
 rebase completed
 @  7:C:
 |
 o  6:B:
 |
 | o  5:F:notdefault
 | |
 o |  4:E:
 | |
 o |  3:D:
 |/
 | o  2:C:
 | |
 | o  1:B:
 |/
 o  0:A:
 
 
 % - Rebase F onto E - check keepbranches
 @  5:F:notdefault
 |
 | o  4:E:
 | |
 | o  3:D:
 |/
 | o  2:C:
 | |
 | o  1:B:
 |/
 o  0:A:
 
 warning: conflicts during merge.
 merging A failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 merging A
 
 % - Solve the conflict and go on
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 @  5:F:notdefault
 |
 o  4:E:
 |
 o  3:D:
 |
 | o  2:C:
 | |
 | o  1:B:
 |/
 o  0:A:
 

tests/test-rebase-collapse.out

@@ -1,215 +1,190 b''
 @  7: H
 |
 | o  6: G
 |/|
 o |  5: F
 | |
 | o  4: E
 |/
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 % Rebasing B onto H
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 6 changes to 6 files (+1 heads)
 rebase completed
 @  5: Collapsed revision
 |  * B
 |  * C
 |  * D
 o  4: H
 |
 | o  3: G
 |/|
 o |  2: F
 | |
 | o  1: E
 |/
 o  0: A
 
 Expected A, B, C, D, F, H
 A
 B
 C
 D
 F
 H
 
 % Rebasing G onto H
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  6: Collapsed revision
 |  * E
 |  * G
 o  5: H
 |
 o  4: F
 |
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 Expected A, E, F, H
 A
 E
 F
 H
 
 @  7: H
 |
 | o    6: G
 | |\
 | | o  5: F
 | | |
 | | o  4: E
 | | |
 | o |  3: D
 | |\|
 | o |  2: C
 |/ /
 | o  1: B
 |/
 o  0: A
 
 
 % Rebase and collapse - more than one external (fail)
 abort: unable to collapse, there is more than one external parent
 
 % Rebase and collapse - E onto H
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files
 rebase completed
 @    5: Collapsed revision
 |\   * E
 | |  * F
 | |  * G
 | o  4: H
 | |
 o |    3: D
 |\ \
 | o |  2: C
 | |/
 o /  1: B
 |/
 o  0: A
 
 Expected A, B, C, E, F, H
 A
 B
 C
 E
 F
 H
 
 @  8: I
 |
 | o    7: H
 | |\
 | | o  6: G
 | | |
 | | o  5: F
 | | |
 | | o  4: E
 | | |
 | o |  3: D
 | |\|
 | o |  2: C
 |/ /
 | o  1: B
 |/
 o  0: A
 
 
 % Rebase and collapse - E onto I
 merging E
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files
 rebase completed
 @    5: Collapsed revision
 |\   * E
 | |  * F
 | |  * G
 | |  * H
 | o  4: I
 | |
 o |    3: D
 |\ \
 | o |  2: C
 | |/
 o /  1: B
 |/
 o  0: A
 
 Expected A, B, C, E, G, I
 A
 B
 C
 E
 G
 I
 Cat E:
 F
 
 @  5: F
 |
 | o    4: E
 | |\
 | | o  3: D
 | | |
 | o |  2: C
 | |/
 | o  1: B
 |/
 o  0: A
 
 
 % Rebase and collapse - B onto F
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 4 changes to 4 files
 rebase completed
 @  2: Collapsed revision
 |  * B
 |  * C
 |  * D
 |  * E
 o  1: F
 |
 o  0: A
 
 Expected A, B, C, D, F
 A
 B
 C
 D
 F

tests/test-rebase-conflicts.out

@@ -1,66 +1,61 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 @  5: L3
 |
 o  4: L2
 |
 o  3: L1
 |
 | o  2: C3
 |/
 o  1: C2
 |
 o  0: C1
 
 
 % Try to call --continue
 abort: no rebase in progress
 
 % Conflicting rebase
 merging common
 warning: conflicts during merge.
 merging common failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 
 % Try to continue without solving the conflict
 abort: unresolved merge conflicts (see hg resolve)
 
 % Conclude rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  5: L3
 |
 o  4: L2
 |
 o  3: L1
 |
 o  2: C3
 |
 o  1: C2
 |
 o  0: C1
 
 
 % Check correctness
   - Rev. 0
 c1
   - Rev. 1
 c1
 c2
   - Rev. 2
 c1
 c2
 c3
   - Rev. 3
 c1
 c2
 c3
   - Rev. 4
 resolved merge
   - Rev. 5
 resolved merge

tests/test-rebase-detach.out

@@ -1,134 +1,114 b''
 @  4: E
 |
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 % Rebasing D onto E detaching from C
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files (+1 heads)
 rebase completed
 @  4: D
 |
 o  3: E
 |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 Expected A, D, E
 A
 D
 E
 
 @  4: E
 |
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 % Rebasing C onto E detaching from B
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  4: D
 |
 o  3: C
 |
 o  2: E
 |
 | o  1: B
 |/
 o  0: A
 
 Expected A, C, D, E
 A
 C
 D
 E
 
 @  4: E
 |
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 % Rebasing B onto E using detach (same as not using it)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files
 rebase completed
 @  4: D
 |
 o  3: C
 |
 o  2: B
 |
 o  1: E
 |
 o  0: A
 
 Expected A, B, C, D, E
 A
 B
 C
 D
 E
 
 @  4: E
 |
 | o  3: D
 | |
 | o  2: C
 | |
 | o  1: B
 |/
 o  0: A
 
 % Rebasing C onto E detaching from B and collapsing
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  3: Collapsed revision
 |  * C
 |  * D
 o  2: E
 |
 | o  1: B
 |/
 o  0: A
 
 Expected A, C, D, E
 A
 C
 D
 E

tests/test-rebase-issue-noparam-single-rev.out

@@ -1,64 +1,54 b''
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 @  4:r2
 |
 o  3:r1
 |
 | o  2:l1
 |/
 o  1:c2
 |
 o  0:c1
 
 
 % Rebase with no arguments - single revision in source branch
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  4:l1
 |
 o  3:r2
 |
 o  2:r1
 |
 o  1:c2
 |
 o  0:c1
 
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 @  4:r1
 |
 | o  3:l2
 | |
 | o  2:l1
 |/
 o  1:c2
 |
 o  0:c1
 
 
 % Rebase with no arguments - single revision in target branch
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  4:l2
 |
 o  3:l1
 |
 o  2:r1
 |
 o  1:c2
 |
 o  0:c1
 

tests/test-rebase-mq-skip.out

@@ -1,23 +1,18 b''
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 % "Mainstream" import p1.patch
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 applying p1.patch
 
 % Rebase
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  3 P0 tags: p0.patch qbase qtip tip
 |
 o  2 P1 tags: qparent
 |
 o  1 R1 tags:
 |
 o  0 C1 tags:
 

tests/test-rebase-mq.out

@@ -1,138 +1,133 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  3 P1 tags: f2.patch qtip tip
 |
 o  2 P0 tags: f.patch qbase
 |
 | o  1 R1 tags:
 |/
 o  0 C1 tags: qparent
 
 
 % Rebase - try to rebase on an applied mq patch
 abort: cannot rebase onto an applied mq patch
 
 % Rebase - same thing, but mq patch is default dest
 abort: cannot rebase onto an applied mq patch
 
 % Rebase - generate a conflict
 merging f
 warning: conflicts during merge.
 merging f failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 
 % Fix the 1st conflict
 warning: conflicts during merge.
 merging f failed!
 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 merging f
 
 % Fix the 2nd conflict
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
 rebase completed
 @  3 P1 tags: f2.patch qtip tip
 |
 o  2 P0 tags: f.patch qbase
 |
 o  1 R1 tags: qparent
 |
 o  0 C1 tags:
 
 
 % Update to qbase
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % f correctly reflects the merge result
 mq1r1
 % And the patch is correct
 # HG changeset patch
 # User test
 # Date
 # Node ID
 # Parent
 P0
 
 diff -r x -r y f
 --- a/f
 +++ b/f
 @@ -1,1 +1,1 @@
 -r1
 +mq1r1
 
 % Update to qtip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % f correctly reflects the merge result
 mq1r1mq2
 % And the patch is correct
 # HG changeset patch
 # User test
 # Date
 # Node ID
 # Parent
 P1
 
 diff -r x -r y f
 --- a/f
 +++ b/f
 @@ -1,1 +1,1 @@
 -mq1r1
 +mq1r1mq2
 
 % Adding one git-style patch and one normal
 popping f2.patch
 popping f.patch
 patch queue now empty
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % Git patch
 P0 (git)
 
 diff --git a/p b/p
 new file mode 100644
 --- /dev/null
 +++ b/p
 @@ -0,0 +1,1 @@
 +mq1
 
 % Normal patch
 P1
 
 diff -r x p
 --- a/p
 +++ b/p
 @@ -1,1 +1,1 @@
 -mq1
 +mq2
 
 % Rebase the applied mq patches
 % And the patches are correct
 % Git patch
 # HG changeset patch
 # User test
 # Date
 # Node ID
 # Parent
 P0 (git)
 
 diff --git a/p b/p
 new file mode 100644
 --- /dev/null
 +++ b/p
 @@ -0,0 +1,1 @@
 +mq1
 
 % Normal patch
 # HG changeset patch
 # User test
 # Date
 # Node ID
 # Parent
 P1
 
 --- a/p
 +++ b/p
 @@ -1,1 +1,1 @@
 -mq1
 +mq2

tests/test-rebase-parameters.out

@@ -1,344 +1,304 b''
 % These fail
 
 % Use continue and abort
 hg rebase: cannot use both abort and continue
 hg rebase [-s REV | -b REV] [-d REV] [options]
 hg rebase {-a|-c}
 
 move changeset (and descendants) to a different branch
 
     Rebase uses repeated merging to graft changesets from one part of history
     (the source) onto another (the destination). This can be useful for
     linearizing *local* changes relative to a master development tree.
 
     You should not rebase changesets that have already been shared with
     others. Doing so will force everybody else to perform the same rebase or
     they will end up with duplicated changesets after pulling in your rebased
     changesets.
 
     If you don't specify a destination changeset ("-d/--dest"), rebase uses
     the tipmost head of the current named branch as the destination. (The
     destination changeset is not modified by rebasing, but new changesets are
     added as its descendants.)
 
     You can specify which changesets to rebase in two ways: as a "source"
     changeset or as a "base" changeset. Both are shorthand for a topologically
     related set of changesets (the "source branch"). If you specify source
     ("-s/--source"), rebase will rebase that changeset and all of its
     descendants onto dest. If you specify base ("-b/--base"), rebase will
     select ancestors of base back to but not including the common ancestor
     with dest. Thus, "-b" is less precise but more convenient than "-s": you
     can specify any changeset in the source branch, and rebase will select the
     whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
     of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch as
     descendants of dest and then destroys the originals. Use "--keep" to
     preserve the original source changesets. Some changesets in the source
     branch (e.g. merges from the destination branch) may be dropped if they no
     longer contribute any change.
 
     One result of the rules for selecting the destination changeset and source
     branch is that, unlike "merge", rebase will do nothing if you are at the
     latest (tipmost) head of a named branch with two heads. You need to
     explicitly specify source and/or destination (or "update" to the other
     head, if it's the head of the intended source branch).
 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
  -s --source        rebase from the specified changeset
  -b --base          rebase from the base of the specified changeset (up to
                     greatest common ancestor of base and dest)
  -d --dest          rebase onto the specified changeset
     --collapse      collapse the rebased changesets
     --keep          keep original changesets
     --keepbranches  keep original branch names
     --detach        force detaching of source from its original branch
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
     --template      display with template
 
 use "hg -v help rebase" to show global options
 
 % Use continue and collapse
 hg rebase: cannot use collapse with continue or abort
 hg rebase [-s REV | -b REV] [-d REV] [options]
 hg rebase {-a|-c}
 
 move changeset (and descendants) to a different branch
 
     Rebase uses repeated merging to graft changesets from one part of history
     (the source) onto another (the destination). This can be useful for
     linearizing *local* changes relative to a master development tree.
 
     You should not rebase changesets that have already been shared with
     others. Doing so will force everybody else to perform the same rebase or
     they will end up with duplicated changesets after pulling in your rebased
     changesets.
 
     If you don't specify a destination changeset ("-d/--dest"), rebase uses
     the tipmost head of the current named branch as the destination. (The
     destination changeset is not modified by rebasing, but new changesets are
     added as its descendants.)
 
     You can specify which changesets to rebase in two ways: as a "source"
     changeset or as a "base" changeset. Both are shorthand for a topologically
     related set of changesets (the "source branch"). If you specify source
     ("-s/--source"), rebase will rebase that changeset and all of its
     descendants onto dest. If you specify base ("-b/--base"), rebase will
     select ancestors of base back to but not including the common ancestor
     with dest. Thus, "-b" is less precise but more convenient than "-s": you
     can specify any changeset in the source branch, and rebase will select the
     whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
     of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch as
     descendants of dest and then destroys the originals. Use "--keep" to
     preserve the original source changesets. Some changesets in the source
     branch (e.g. merges from the destination branch) may be dropped if they no
     longer contribute any change.
 
     One result of the rules for selecting the destination changeset and source
     branch is that, unlike "merge", rebase will do nothing if you are at the
     latest (tipmost) head of a named branch with two heads. You need to
     explicitly specify source and/or destination (or "update" to the other
     head, if it's the head of the intended source branch).
 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
  -s --source        rebase from the specified changeset
  -b --base          rebase from the base of the specified changeset (up to
                     greatest common ancestor of base and dest)
  -d --dest          rebase onto the specified changeset
     --collapse      collapse the rebased changesets
     --keep          keep original changesets
     --keepbranches  keep original branch names
     --detach        force detaching of source from its original branch
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
     --template      display with template
 
 use "hg -v help rebase" to show global options
 
 % Use continue/abort and dest/source
 hg rebase: abort and continue do not allow specifying revisions
 hg rebase [-s REV | -b REV] [-d REV] [options]
 hg rebase {-a|-c}
 
 move changeset (and descendants) to a different branch
 
     Rebase uses repeated merging to graft changesets from one part of history
     (the source) onto another (the destination). This can be useful for
     linearizing *local* changes relative to a master development tree.
 
     You should not rebase changesets that have already been shared with
     others. Doing so will force everybody else to perform the same rebase or
     they will end up with duplicated changesets after pulling in your rebased
     changesets.
 
     If you don't specify a destination changeset ("-d/--dest"), rebase uses
     the tipmost head of the current named branch as the destination. (The
     destination changeset is not modified by rebasing, but new changesets are
     added as its descendants.)
 
     You can specify which changesets to rebase in two ways: as a "source"
     changeset or as a "base" changeset. Both are shorthand for a topologically
     related set of changesets (the "source branch"). If you specify source
     ("-s/--source"), rebase will rebase that changeset and all of its
     descendants onto dest. If you specify base ("-b/--base"), rebase will
     select ancestors of base back to but not including the common ancestor
     with dest. Thus, "-b" is less precise but more convenient than "-s": you
     can specify any changeset in the source branch, and rebase will select the
     whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
     of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch as
     descendants of dest and then destroys the originals. Use "--keep" to
     preserve the original source changesets. Some changesets in the source
     branch (e.g. merges from the destination branch) may be dropped if they no
     longer contribute any change.
 
     One result of the rules for selecting the destination changeset and source
     branch is that, unlike "merge", rebase will do nothing if you are at the
     latest (tipmost) head of a named branch with two heads. You need to
     explicitly specify source and/or destination (or "update" to the other
     head, if it's the head of the intended source branch).
 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
  -s --source        rebase from the specified changeset
  -b --base          rebase from the base of the specified changeset (up to
                     greatest common ancestor of base and dest)
  -d --dest          rebase onto the specified changeset
     --collapse      collapse the rebased changesets
     --keep          keep original changesets
     --keepbranches  keep original branch names
     --detach        force detaching of source from its original branch
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
     --template      display with template
 
 use "hg -v help rebase" to show global options
 
 % Use source and base
 hg rebase: cannot specify both a revision and a base
 hg rebase [-s REV | -b REV] [-d REV] [options]
 hg rebase {-a|-c}
 
 move changeset (and descendants) to a different branch
 
     Rebase uses repeated merging to graft changesets from one part of history
     (the source) onto another (the destination). This can be useful for
     linearizing *local* changes relative to a master development tree.
 
     You should not rebase changesets that have already been shared with
     others. Doing so will force everybody else to perform the same rebase or
     they will end up with duplicated changesets after pulling in your rebased
     changesets.
 
     If you don't specify a destination changeset ("-d/--dest"), rebase uses
     the tipmost head of the current named branch as the destination. (The
     destination changeset is not modified by rebasing, but new changesets are
     added as its descendants.)
 
     You can specify which changesets to rebase in two ways: as a "source"
     changeset or as a "base" changeset. Both are shorthand for a topologically
     related set of changesets (the "source branch"). If you specify source
     ("-s/--source"), rebase will rebase that changeset and all of its
     descendants onto dest. If you specify base ("-b/--base"), rebase will
     select ancestors of base back to but not including the common ancestor
     with dest. Thus, "-b" is less precise but more convenient than "-s": you
     can specify any changeset in the source branch, and rebase will select the
     whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
     of the working directory as the base.
 
     By default, rebase recreates the changesets in the source branch as
     descendants of dest and then destroys the originals. Use "--keep" to
     preserve the original source changesets. Some changesets in the source
     branch (e.g. merges from the destination branch) may be dropped if they no
     longer contribute any change.
 
     One result of the rules for selecting the destination changeset and source
     branch is that, unlike "merge", rebase will do nothing if you are at the
     latest (tipmost) head of a named branch with two heads. You need to
     explicitly specify source and/or destination (or "update" to the other
     head, if it's the head of the intended source branch).
 
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
 options:
 
  -s --source        rebase from the specified changeset
  -b --base          rebase from the base of the specified changeset (up to
                     greatest common ancestor of base and dest)
  -d --dest          rebase onto the specified changeset
     --collapse      collapse the rebased changesets
     --keep          keep original changesets
     --keepbranches  keep original branch names
     --detach        force detaching of source from its original branch
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
     --template      display with template
 
 use "hg -v help rebase" to show global options
 
 % Rebase with no arguments - from current
 nothing to rebase
 
 % Rebase with no arguments - from the current branch
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 nothing to rebase
 % ----------
 % These work
 
 % Rebase with no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 % Try to rollback after a rebase (fail)
 no rollback information available
 
 % Rebase with base == '.' => same as no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 
 % Rebase with dest == default => same as no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 
 % Specify only source (from 4 onto 7)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files (-1 heads)
 rebase completed
 
 % Specify only dest (from 3 onto 6)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files (+1 heads)
 rebase completed
 
 % Specify only base (from 3 onto 7)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 
 % Specify source and dest (from 4 onto 6)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files
 rebase completed
 
 % Specify base and dest (from 3 onto 6)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files (+1 heads)
 rebase completed

tests/test-rebase-pull.out

@@ -1,57 +1,52 b''
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 % Now b has one revision to be pulled from a
 pulling from 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  3:L1
 |
 o  2:R1
 |
 o  1:C2
 |
 o  0:C1
 
 
 % Re-run pull --rebase
 pulling from 
 searching for changes
 no changes found
 
 % Invoke pull --rebase and nothing to rebase
 pulling from 
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 nothing to rebase
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  2
 |
 
 % pull --rebase --update should ignore --update
 pulling from 
 searching for changes
 no changes found
 
 % pull --rebase doesn't update if nothing has been pulled
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 pulling from 
 searching for changes
 no changes found
 o  2
 |

tests/test-rebase-scenario-global.out

@@ -1,144 +1,114 b''
 @  5: F
 |
 | o  4: E
 |/|
 o |  3: D
 | |
 | o  2: C
 |/
 | o  1: B
 |/
 o  0: A
 
 % Rebasing
 % B onto F - simple rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 4 changes to 4 files (+1 heads)
 rebase completed
 @  5: B
 |
 o  4: F
 |
 | o  3: E
 |/|
 o |  2: D
 | |
 | o  1: C
 |/
 o  0: A
 
 % B onto D - intermediate point
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 4 changes to 4 files (+2 heads)
 rebase completed
 @  5: B
 |
 | o  4: F
 |/
 | o  3: E
 |/|
 o |  2: D
 | |
 | o  1: C
 |/
 o  0: A
 
 % C onto F - skip of E
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  4: C
 |
 o  3: F
 |
 o  2: D
 |
 | o  1: B
 |/
 o  0: A
 
 % D onto C - rebase of a branching point (skip E)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  4: F
 |
 o  3: D
 |
 o  2: C
 |
 | o  1: B
 |/
 o  0: A
 
 % E onto F - merged revision having a parent in ancestors of target
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 1 changes to 1 files (-1 heads)
 rebase completed
 @    5: E
 |\
 | o  4: F
 | |
 | o  3: D
 | |
 o |  2: C
 |/
 | o  1: B
 |/
 o  0: A
 
 % D onto B - E maintains C as parent
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 2 changes to 2 files
 rebase completed
 @  5: F
 |
 | o  4: E
 |/|
 o |  3: D
 | |
 | o  2: C
 | |
 o |  1: B
 |/
 o  0: A
 
 % These will fail (using --source)
 % E onto D - rebase onto an ancestor
 abort: source is descendant of destination
 % D onto E - rebase onto a descendant
 abort: source is ancestor of destination
 % E onto B - merge revision with both parents not in ancestors of target
 abort: cannot use revision 4 as base, result would have 3 parents
 
 % These will abort gracefully (using --base)
 % E onto E - rebase onto same changeset
 nothing to rebase
 % E onto D - rebase onto an ancestor
 nothing to rebase
 % D onto E - rebase onto a descendant
 nothing to rebase

tests/test-strip-cross.out

@@ -1,114 +1,94 b''
 crossed/.hg/store/00manifest.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0     112      0       0 6f105cbb914d 000000000000 000000000000
      1       112      56      1       3 1b55917b3699 000000000000 000000000000
      2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
      3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
      4       413      87      4       4 0b76e38b4070 000000000000 000000000000
 
 crossed/.hg/store/data/012.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       3      1       1 5d9299349fc0 000000000000 000000000000
      2         6       3      2       2 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/021.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b8e02f643373 000000000000 000000000000
      1         3       3      1       2 5d9299349fc0 000000000000 000000000000
      2         6       3      2       1 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/102.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       1 b8e02f643373 000000000000 000000000000
      1         3       3      1       0 5d9299349fc0 000000000000 000000000000
      2         6       3      2       2 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/120.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       1 b8e02f643373 000000000000 000000000000
      1         3       3      1       2 5d9299349fc0 000000000000 000000000000
      2         6       3      2       0 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/201.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       2 b8e02f643373 000000000000 000000000000
      1         3       3      1       0 5d9299349fc0 000000000000 000000000000
      2         6       3      2       1 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/210.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       2 b8e02f643373 000000000000 000000000000
      1         3       3      1       1 5d9299349fc0 000000000000 000000000000
      2         6       3      2       0 2661d26c6496 000000000000 000000000000
 
 crossed/.hg/store/data/manifest-file.i
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       3 b8e02f643373 000000000000 000000000000
      1         3       3      1       4 5d9299349fc0 000000000000 000000000000
 
 % Trying to strip revision 0
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 15 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 15 total revisions
 
 % Trying to strip revision 1
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 12 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 14 total revisions
 
 % Trying to strip revision 2
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 8 changes to 6 files (+2 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 14 total revisions
 
 % Trying to strip revision 3
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 2 files (+1 heads)
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 19 total revisions
 
 % Trying to strip revision 4
 saved backup bundle to 
 % Verifying
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 7 files, 4 changesets, 19 total revisions