filelog: sort meta entries, ensure deterministic order

mercurial/filelog.py

@@ -1,68 +1,68 b''
 # filelog.py - file history class for mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[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.
 
 import revlog
 
 class filelog(revlog.revlog):
     def __init__(self, opener, path):
         revlog.revlog.__init__(self, opener,
                         "/".join(("data", path + ".i")))
 
     def read(self, node):
         t = self.revision(node)
         if not t.startswith('\1\n'):
             return t
         s = t.index('\1\n', 2)
         return t[s + 2:]
 
     def _readmeta(self, node):
         t = self.revision(node)
         if not t.startswith('\1\n'):
             return {}
         s = t.index('\1\n', 2)
         mt = t[2:s]
         m = {}
         for l in mt.splitlines():
             k, v = l.split(": ", 1)
             m[k] = v
         return m
 
     def add(self, text, meta, transaction, link, p1=None, p2=None):
         if meta or text.startswith('\1\n'):
             mt = ""
             if meta:
-                mt = ["%s: %s\n" % (k, v) for k, v in meta.iteritems()]
+                mt = ["%s: %s\n" % (k, v) for k, v in sorted(meta.iteritems())]
             text = "\1\n%s\1\n%s" % ("".join(mt), text)
         return self.addrevision(text, transaction, link, p1, p2)
 
     def renamed(self, node):
         if self.parents(node)[0] != revlog.nullid:
             return False
         m = self._readmeta(node)
         if m and "copy" in m:
             return (m["copy"], revlog.bin(m["copyrev"]))
         return False
 
     def size(self, rev):
         """return the size of a given revision"""
 
         # for revisions with renames, we have to go the slow way
         node = self.node(rev)
         if self.renamed(node):
             return len(self.read(node))
 
         return revlog.revlog.size(self, rev)
 
     def cmp(self, node, text):
         """compare text with a given file revision"""
 
         # for renames, we have to go the slow way
         if self.renamed(node):
             t2 = self.read(node)
             return t2 != text
 
         return revlog.revlog.cmp(self, node, text)

tests/test-bundle-r.out

@@ -1,249 +1,249 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       7 905359268f77 000000000000 000000000000
+     0         0      75      0       7 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       8 905359268f77 000000000000 000000000000
+     0         0      75      0       8 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
-     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
-     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
+     5       250      68      3       7 09bb521d218d de68e904d169 000000000000
+     6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 searching for changes
 1 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 0:5649c9d34dd8
 searching for changes
 2 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 1:10b2180f755b
 searching for changes
 3 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 2:d62976ca1e50
 searching for changes
 4 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 3:ac69c658229d
 searching for changes
 2 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 1:5f4f3ceb285e
 searching for changes
 3 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 2:024e4e7df376
 searching for changes
 4 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 3:1e3f6b843bd6
 searching for changes
 5 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
-4:80fe151401c2
+4:27f57c869697
 searching for changes
 5 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
-4:836ac62537ab
+4:088ff9d6e1e1
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 rolling back last transaction
 % should fail
 abort: --base is incompatible with specifying a destination
 abort: repository default-push not found!
 2 changesets found
 4 changesets found
 6 changesets found
 1 changesets found
 1 changesets found
 4 changesets found
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % 2
 2:d62976ca1e50
 adding changesets
 transaction abort!
 rollback completed
 abort: 00changelog.i@ac69c658229d: unknown parent!
 % 2
 2:d62976ca1e50
 adding changesets
 adding manifests
 adding file changes
 added 6 changesets with 4 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 % 8
-8:836ac62537ab
+8:088ff9d6e1e1
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 rolling back last transaction
 % 2
 2:d62976ca1e50
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
 % 4
-4:836ac62537ab
+4:088ff9d6e1e1
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 rolling back last transaction
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 3 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 % 6
-6:80fe151401c2
+6:27f57c869697
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 7 changesets, 6 total revisions
 rolling back last transaction
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
 % 4
-4:836ac62537ab
+4:088ff9d6e1e1
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 warning: detected divergent renames of afile to:
  anotherfile
  adifferentfile
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 7 changesets found
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding changesets
 adding manifests
 adding file changes
 added 7 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 % 9
-9:607fe5912aad
+9:e3061ea42e4c
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 10 changesets, 7 total revisions

tests/test-bundle.out

@@ -1,365 +1,365 b''
 ====== Setting up test
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 ====== Bundle --all
 9 changesets found
 ====== Bundle test to full.hg
 searching for changes
 9 changesets found
 ====== Unbundle full.hg in test
 adding changesets
 adding manifests
 adding file changes
 added 0 changesets with 0 changes to 4 files
 (run 'hg update' to get a working copy)
 ====== Verify empty
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 0 files, 0 changesets, 0 total revisions
 ====== Pull full.hg into test (using --cwd)
 pulling from ../full.hg
 searching for changes
 no changes found
 ====== Pull full.hg into empty (using --cwd)
 pulling from ../full.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 ====== Rollback empty
 rolling back last transaction
 ====== Pull full.hg into empty again (using --cwd)
 pulling from ../full.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 ====== Pull full.hg into test (using -R)
 pulling from full.hg
 searching for changes
 no changes found
 ====== Pull full.hg into empty (using -R)
 pulling from full.hg
 searching for changes
 no changes found
 ====== Rollback empty
 rolling back last transaction
 ====== Pull full.hg into empty again (using -R)
 pulling from full.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 ====== Log -R full.hg in fresh empty
-changeset:   8:836ac62537ab
+changeset:   8:088ff9d6e1e1
 tag:         tip
 parent:      3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3m
 
-changeset:   7:80fe151401c2
+changeset:   7:27f57c869697
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3m
 
 changeset:   6:1e3f6b843bd6
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3
 
 changeset:   5:024e4e7df376
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.2
 
 changeset:   4:5f4f3ceb285e
 parent:      0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.1
 
 changeset:   3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3
 
 changeset:   2:d62976ca1e50
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.2
 
 changeset:   1:10b2180f755b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.1
 
 changeset:   0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.0
 
 ====== Pull ../full.hg into empty (with hook)
 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg 
 pulling from bundle://../full.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 ====== Rollback empty
 rolling back last transaction
 ====== Log -R bundle:empty+full.hg
 8 7 6 5 4 3 2 1 0 
 ====== Pull full.hg into empty again (using -R; with hook)
 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg 
 pulling from full.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 ====== Create partial clones
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ====== Log -R full.hg in partial
-changeset:   8:836ac62537ab
+changeset:   8:088ff9d6e1e1
 tag:         tip
 parent:      3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3m
 
-changeset:   7:80fe151401c2
+changeset:   7:27f57c869697
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3m
 
 changeset:   6:1e3f6b843bd6
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3
 
 changeset:   5:024e4e7df376
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.2
 
 changeset:   4:5f4f3ceb285e
 parent:      0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.1
 
 changeset:   3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3
 
 changeset:   2:d62976ca1e50
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.2
 
 changeset:   1:10b2180f755b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.1
 
 changeset:   0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.0
 
 ====== Incoming full.hg in partial
 comparing with bundle://../full.hg
 searching for changes
 changeset:   4:5f4f3ceb285e
 parent:      0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.1
 
 changeset:   5:024e4e7df376
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.2
 
 changeset:   6:1e3f6b843bd6
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3
 
-changeset:   7:80fe151401c2
+changeset:   7:27f57c869697
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3m
 
-changeset:   8:836ac62537ab
+changeset:   8:088ff9d6e1e1
 tag:         tip
 parent:      3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3m
 
 ====== Outgoing -R full.hg vs partial2 in partial
 comparing with ../partial2
 searching for changes
 changeset:   4:5f4f3ceb285e
 parent:      0:5649c9d34dd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.1
 
 changeset:   5:024e4e7df376
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.2
 
 changeset:   6:1e3f6b843bd6
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3
 
-changeset:   7:80fe151401c2
+changeset:   7:27f57c869697
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3m
 
-changeset:   8:836ac62537ab
+changeset:   8:088ff9d6e1e1
 tag:         tip
 parent:      3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3m
 
 ====== Outgoing -R does-not-exist.hg vs partial2 in partial
 abort: No such file or directory: ../does-not-exist.hg
 ====== Direct clone from bundle (all-history)
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 9 changesets with 7 changes to 4 files (+1 heads)
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset:   8:836ac62537ab
+changeset:   8:088ff9d6e1e1
 tag:         tip
 parent:      3:ac69c658229d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     0.3m
 
-changeset:   7:80fe151401c2
+changeset:   7:27f57c869697
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1.3m
 
 ====== Unbundle incremental bundles into fresh empty in one go
 1 changesets found
 1 changesets found
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ====== test for 540d1059c802
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 searching for changes
 1 changesets found
 comparing with ../bundle.hg
 searching for changes
 changeset:   2:ed1b79f46b9a
 tag:         tip
 parent:      0:bbd179dfa0a7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change foo
 
 ===== test that verify bundle does not traceback
 abort: 00changelog.i@bbd179dfa0a7: unknown parent!
 abort: cannot verify bundle or remote repos
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions
 ====== diff against bundle
-diff -r 836ac62537ab anotherfile
+diff -r 088ff9d6e1e1 anotherfile
 --- a/anotherfile	Mon Jan 12 13:46:40 1970 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,4 +0,0 @@
 -0
 -1
 -2
 -3
 ====== bundle single branch
 adding a
 adding b
 adding b1
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 adding c
 created new head
 adding c1
 == bundling via incoming
 comparing with .
 searching for changes
 d2ae7f538514cd87c17547b0de4cea71fe1af9fb
 5ece8e77363e2b5269e27c66828b72da29e4341a
 == bundling
 searching for changes
 common changesets up to c0025332f9ed
 2 changesets found
 list of changesets:
 d2ae7f538514cd87c17547b0de4cea71fe1af9fb
 5ece8e77363e2b5269e27c66828b72da29e4341a
 bundle changes: 0 chunks
 bundle changes: 1 chunks
 bundle changes: 2 chunks
 bundle changes: 3 chunks
 bundle changes: 4 chunks
 bundle changes: 5 chunks
 bundle changes: 6 chunks
 bundle manifests: 0 chunks
 bundle manifests: 1 chunks
 bundle manifests: 2 chunks
 bundle manifests: 3 chunks
 bundle manifests: 4 chunks
 bundle manifests: 5 chunks
 bundle manifests: 6 chunks
 bundle files: b 0 chunks
 bundle files: b 1 chunks
 bundle files: b 2 chunks
 bundle files: b 3 chunks
 bundle files: b1 4 chunks
 bundle files: b1 5 chunks
 bundle files: b1 6 chunks
 bundle files: b1 7 chunks

tests/test-clone-r.out

@@ -1,147 +1,147 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       7 905359268f77 000000000000 000000000000
+     0         0      75      0       7 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       8 905359268f77 000000000000 000000000000
+     0         0      75      0       8 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
-     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
-     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
+     5       250      68      3       7 09bb521d218d de68e904d169 000000000000
+     6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-command-template.out

@@ -1,1073 +1,1073 b''
 created new head
 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 created new head
 # default style is like normal output
 #  normal
 #  verbose
 #  debug
 # revision with no copies (used to print a traceback)
 
 # compact style works
-8[tip]   3bdecc1cde0c   2020-01-01 10:01 +0000   test
+8[tip]   95c24699272e   2020-01-01 10:01 +0000   test
   third
 
 7:-1   29114dbae42b   1970-01-12 13:46 +0000   user
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
   other 1
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
-8[tip]   3bdecc1cde0c   2020-01-01 10:01 +0000   test
+8[tip]   95c24699272e   2020-01-01 10:01 +0000   test
   third
 
 7:-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other@place
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
   other 1
 other 2
 
 other 3
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
   line 1
 line 2
 
-8[tip]:7,-1   3bdecc1cde0c   2020-01-01 10:01 +0000   test
+8[tip]:7,-1   95c24699272e   2020-01-01 10:01 +0000   test
   third
 
 7:-1,-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3,-1   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2:1,-1   97054abb4ab8   1970-01-14 21:20 +0000   other@place
   no person
 
 1:0,-1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
   other 1
 other 2
 
 other 3
 
 0:-1,-1   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
   line 1
 line 2
 
 # xml style works (--style xml)
 <?xml version="1.0"?>
 <log>
-<logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
+<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
 <tag>tip</tag>
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 </logentry>
 </log>
 # xml style works (-v --style xml)
 <?xml version="1.0"?>
 <log>
-<logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
+<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
 <tag>tip</tag>
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 <paths>
 <path action="A">fourth</path>
 <path action="A">third</path>
 <path action="R">second</path>
 </paths>
 <copies>
 <copy source="second">fourth</copy>
 </copies>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 <paths>
 <path action="A">second</path>
 </paths>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 <paths>
 </paths>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 <paths>
 <path action="A">d</path>
 </paths>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 <paths>
 </paths>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 <paths>
 <path action="M">c</path>
 </paths>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 <paths>
 <path action="A">c</path>
 </paths>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 <paths>
 <path action="A">b</path>
 </paths>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 <paths>
 <path action="A">a</path>
 </paths>
 </logentry>
 </log>
 # xml style works (--debug --style xml)
 <?xml version="1.0"?>
 <log>
-<logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
+<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
 <tag>tip</tag>
 <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 <paths>
 <path action="A">fourth</path>
 <path action="A">third</path>
 <path action="R">second</path>
 </paths>
 <copies>
 <copy source="second">fourth</copy>
 </copies>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 <paths>
 <path action="A">second</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 <paths>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 <paths>
 <path action="A">d</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 <paths>
 </paths>
 <extra key="branch">foo</extra>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 <paths>
 <path action="M">c</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 <paths>
 <path action="A">c</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 <paths>
 <path action="A">b</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 <paths>
 <path action="A">a</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 </log>
 # error if style not readable
 abort: Permission denied: ./q
 # error if no style
 abort: style not found: notexist
 # error if style missing key
 abort: ./t: no key named 'changeset'
 # error if include fails
 abort: template file ./q: Permission denied
 # include works
 8
 7
 6
 5
 4
 3
 2
 1
 0
 # ui.style works
 8
 7
 6
 5
 4
 3
 2
 1
 0
 # issue338
 2020-01-01  test  <test>
 
 	* fourth, second, third:
 	third
-	[3bdecc1cde0c] [tip]
+	[95c24699272e] [tip]
 
 1970-01-12  User Name  <user@hostname>
 
 	* second:
 	second
 	[29114dbae42b]
 
 1970-01-18  person  <person>
 
 	* merge
 	[c7b487c6c50e]
 
 	* d:
 	new head
 	[13207e5a10d9]
 
 1970-01-17  person  <person>
 
 	* new branch
 	[32a18f097fcc] <foo>
 
 1970-01-16  person  <person>
 
 	* c:
 	no user, no domain
 	[10e46f2dcbf4]
 
 1970-01-14  other  <other@place>
 
 	* c:
 	no person
 	[97054abb4ab8]
 
 1970-01-13  A. N. Other  <other@place>
 
 	* b:
 	other 1 other 2
 
 	other 3
 	[b608e9d1a3f0]
 
 1970-01-12  User Name  <user@hostname>
 
 	* a:
 	line 1 line 2
 	[1e4e1b8f71e0]
 
 # keys work
 author: test
 author: User Name <user@hostname>
 author: person
 author: person
 author: person
 author: person
 author: other@place
 author: A. N. Other <other@place>
 author: User Name <user@hostname>
 author--verbose: test
 author--verbose: User Name <user@hostname>
 author--verbose: person
 author--verbose: person
 author--verbose: person
 author--verbose: person
 author--verbose: other@place
 author--verbose: A. N. Other <other@place>
 author--verbose: User Name <user@hostname>
 author--debug: test
 author--debug: User Name <user@hostname>
 author--debug: person
 author--debug: person
 author--debug: person
 author--debug: person
 author--debug: other@place
 author--debug: A. N. Other <other@place>
 author--debug: User Name <user@hostname>
 branches: 
 branches: 
 branches: 
 branches: 
 branches: foo
 branches: 
 branches: 
 branches: 
 branches: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: foo
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--verbose: 
 branches--debug: 
 branches--debug: 
 branches--debug: 
 branches--debug: 
 branches--debug: foo
 branches--debug: 
 branches--debug: 
 branches--debug: 
 branches--debug: 
 date: 1577872860.00
 date: 1000000.00
 date: 1500001.00
 date: 1500000.00
 date: 1400000.00
 date: 1300000.00
 date: 1200000.00
 date: 1100000.00
 date: 1000000.00
 date--verbose: 1577872860.00
 date--verbose: 1000000.00
 date--verbose: 1500001.00
 date--verbose: 1500000.00
 date--verbose: 1400000.00
 date--verbose: 1300000.00
 date--verbose: 1200000.00
 date--verbose: 1100000.00
 date--verbose: 1000000.00
 date--debug: 1577872860.00
 date--debug: 1000000.00
 date--debug: 1500001.00
 date--debug: 1500000.00
 date--debug: 1400000.00
 date--debug: 1300000.00
 date--debug: 1200000.00
 date--debug: 1100000.00
 date--debug: 1000000.00
 desc: third
 desc: second
 desc: merge
 desc: new head
 desc: new branch
 desc: no user, no domain
 desc: no person
 desc: other 1
 other 2
 
 other 3
 desc: line 1
 line 2
 desc--verbose: third
 desc--verbose: second
 desc--verbose: merge
 desc--verbose: new head
 desc--verbose: new branch
 desc--verbose: no user, no domain
 desc--verbose: no person
 desc--verbose: other 1
 other 2
 
 other 3
 desc--verbose: line 1
 line 2
 desc--debug: third
 desc--debug: second
 desc--debug: merge
 desc--debug: new head
 desc--debug: new branch
 desc--debug: no user, no domain
 desc--debug: no person
 desc--debug: other 1
 other 2
 
 other 3
 desc--debug: line 1
 line 2
 file_adds: fourth third
 file_adds: second
 file_adds: 
 file_adds: d
 file_adds: 
 file_adds: 
 file_adds: c
 file_adds: b
 file_adds: a
 file_adds--verbose: fourth third
 file_adds--verbose: second
 file_adds--verbose: 
 file_adds--verbose: d
 file_adds--verbose: 
 file_adds--verbose: 
 file_adds--verbose: c
 file_adds--verbose: b
 file_adds--verbose: a
 file_adds--debug: fourth third
 file_adds--debug: second
 file_adds--debug: 
 file_adds--debug: d
 file_adds--debug: 
 file_adds--debug: 
 file_adds--debug: c
 file_adds--debug: b
 file_adds--debug: a
 file_dels: second
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels: 
 file_dels--verbose: second
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--verbose: 
 file_dels--debug: second
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_dels--debug: 
 file_mods: 
 file_mods: 
 file_mods: 
 file_mods: 
 file_mods: 
 file_mods: c
 file_mods: 
 file_mods: 
 file_mods: 
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--verbose: c
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--verbose: 
 file_mods--debug: 
 file_mods--debug: 
 file_mods--debug: 
 file_mods--debug: 
 file_mods--debug: 
 file_mods--debug: c
 file_mods--debug: 
 file_mods--debug: 
 file_mods--debug: 
 file_copies: fourth (second)
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies: 
 file_copies--verbose: fourth (second)
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--verbose: 
 file_copies--debug: fourth (second)
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies--debug: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--verbose: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 file_copies_switch--debug: 
 files: fourth second third
 files: second
 files: 
 files: d
 files: 
 files: c
 files: c
 files: b
 files: a
 files--verbose: fourth second third
 files--verbose: second
 files--verbose: 
 files--verbose: d
 files--verbose: 
 files--verbose: c
 files--verbose: c
 files--verbose: b
 files--verbose: a
 files--debug: fourth second third
 files--debug: second
 files--debug: 
 files--debug: d
 files--debug: 
 files--debug: c
 files--debug: c
 files--debug: b
 files--debug: a
-manifest: 8:79c71159cb0a
+manifest: 8:94961b75a2da
 manifest: 7:f2dbc354b94e
 manifest: 6:91015e9dbdd7
 manifest: 5:4dc3def4f9b4
 manifest: 4:90ae8dda64e1
 manifest: 3:cb5a1327723b
 manifest: 2:6e0e82995c35
 manifest: 1:4e8d705b1e53
 manifest: 0:a0c8bcbbb45c
-manifest--verbose: 8:79c71159cb0a
+manifest--verbose: 8:94961b75a2da
 manifest--verbose: 7:f2dbc354b94e
 manifest--verbose: 6:91015e9dbdd7
 manifest--verbose: 5:4dc3def4f9b4
 manifest--verbose: 4:90ae8dda64e1
 manifest--verbose: 3:cb5a1327723b
 manifest--verbose: 2:6e0e82995c35
 manifest--verbose: 1:4e8d705b1e53
 manifest--verbose: 0:a0c8bcbbb45c
-manifest--debug: 8:79c71159cb0a1a84add78e7922a1e5e7be34c499
+manifest--debug: 8:94961b75a2da554b4df6fb599e5bfc7d48de0c64
 manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
 manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
 manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
 manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363
 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
 manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
-node: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
+node: 95c24699272ef57d062b8bccc32c878bf841784a
 node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node: 13207e5a10d9fd28ec424934298e176197f2c67f
 node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node: 97054abb4ab824450e9164180baf491ae0078465
 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
-node--verbose: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
+node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
 node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
-node--debug: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
+node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
 node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--debug: 97054abb4ab824450e9164180baf491ae0078465
 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
 parents: 
 parents: -1:000000000000 
 parents: 5:13207e5a10d9 4:32a18f097fcc 
 parents: 3:10e46f2dcbf4 
 parents: 
 parents: 
 parents: 
 parents: 
 parents: 
 parents--verbose: 
 parents--verbose: -1:000000000000 
 parents--verbose: 5:13207e5a10d9 4:32a18f097fcc 
 parents--verbose: 3:10e46f2dcbf4 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
 parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 
 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
 parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 
 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
 parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
 parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
 parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
 parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
 parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
 rev: 8
 rev: 7
 rev: 6
 rev: 5
 rev: 4
 rev: 3
 rev: 2
 rev: 1
 rev: 0
 rev--verbose: 8
 rev--verbose: 7
 rev--verbose: 6
 rev--verbose: 5
 rev--verbose: 4
 rev--verbose: 3
 rev--verbose: 2
 rev--verbose: 1
 rev--verbose: 0
 rev--debug: 8
 rev--debug: 7
 rev--debug: 6
 rev--debug: 5
 rev--debug: 4
 rev--debug: 3
 rev--debug: 2
 rev--debug: 1
 rev--debug: 0
 tags: tip
 tags: 
 tags: 
 tags: 
 tags: 
 tags: 
 tags: 
 tags: 
 tags: 
 tags--verbose: tip
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--verbose: 
 tags--debug: tip
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
 tags--debug: 
 diffstat: 3: +2/-1
 diffstat: 1: +1/-0
 diffstat: 0: +0/-0
 diffstat: 1: +1/-0
 diffstat: 0: +0/-0
 diffstat: 1: +1/-0
 diffstat: 1: +4/-0
 diffstat: 1: +2/-0
 diffstat: 1: +1/-0
 diffstat--verbose: 3: +2/-1
 diffstat--verbose: 1: +1/-0
 diffstat--verbose: 0: +0/-0
 diffstat--verbose: 1: +1/-0
 diffstat--verbose: 0: +0/-0
 diffstat--verbose: 1: +1/-0
 diffstat--verbose: 1: +4/-0
 diffstat--verbose: 1: +2/-0
 diffstat--verbose: 1: +1/-0
 diffstat--debug: 3: +2/-1
 diffstat--debug: 1: +1/-0
 diffstat--debug: 0: +0/-0
 diffstat--debug: 1: +1/-0
 diffstat--debug: 0: +0/-0
 diffstat--debug: 1: +1/-0
 diffstat--debug: 1: +4/-0
 diffstat--debug: 1: +2/-0
 diffstat--debug: 1: +1/-0
 extras: branch=default
 extras: branch=default
 extras: branch=default
 extras: branch=default
 extras: branch=foo
 extras: branch=default
 extras: branch=default
 extras: branch=default
 extras: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=foo
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--verbose: branch=default
 extras--debug: branch=default
 extras--debug: branch=default
 extras--debug: branch=default
 extras--debug: branch=default
 extras--debug: branch=foo
 extras--debug: branch=default
 extras--debug: branch=default
 extras--debug: branch=default
 extras--debug: branch=default
 # filters work
 
 hostname
 
 
 
 
 place
 place
 hostname
 test
 User Name
 person
 person
 person
 person
 other
 A. N. Other
 User Name
 test
 user
 person
 person
 person
 person
 other
 other
 user
 in the future
 Wed Jan 01 10:01:00 2020 +0000
 Mon Jan 12 13:46:40 1970 +0000
 Sun Jan 18 08:40:01 1970 +0000
 Sun Jan 18 08:40:00 1970 +0000
 Sat Jan 17 04:53:20 1970 +0000
 Fri Jan 16 01:06:40 1970 +0000
 Wed Jan 14 21:20:00 1970 +0000
 Tue Jan 13 17:33:20 1970 +0000
 Mon Jan 12 13:46:40 1970 +0000
 2020-01-01 10:01 +0000
 1970-01-12 13:46 +0000
 1970-01-18 08:40 +0000
 1970-01-18 08:40 +0000
 1970-01-17 04:53 +0000
 1970-01-16 01:06 +0000
 1970-01-14 21:20 +0000
 1970-01-13 17:33 +0000
 1970-01-12 13:46 +0000
 2020-01-01 10:01:00 +0000
 1970-01-12 13:46:40 +0000
 1970-01-18 08:40:01 +0000
 1970-01-18 08:40:00 +0000
 1970-01-17 04:53:20 +0000
 1970-01-16 01:06:40 +0000
 1970-01-14 21:20:00 +0000
 1970-01-13 17:33:20 +0000
 1970-01-12 13:46:40 +0000
 Wed, 01 Jan 2020 10:01:00 +0000
 Mon, 12 Jan 1970 13:46:40 +0000
 Sun, 18 Jan 1970 08:40:01 +0000
 Sun, 18 Jan 1970 08:40:00 +0000
 Sat, 17 Jan 1970 04:53:20 +0000
 Fri, 16 Jan 1970 01:06:40 +0000
 Wed, 14 Jan 1970 21:20:00 +0000
 Tue, 13 Jan 1970 17:33:20 +0000
 Mon, 12 Jan 1970 13:46:40 +0000
 third
 second
 merge
 new head
 new branch
 no user, no domain
 no person
 other 1
 line 1
-3bdecc1cde0c
+95c24699272e
 29114dbae42b
 c7b487c6c50e
 13207e5a10d9
 32a18f097fcc
 10e46f2dcbf4
 97054abb4ab8
 b608e9d1a3f0
 1e4e1b8f71e0
 <changeset author="test"/>
 <changeset author="User Name &lt;user@hostname&gt;"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="other@place"/>
 <changeset author="A. N. Other &lt;other@place&gt;"/>
 <changeset author="User Name &lt;user@hostname&gt;"/>
 # formatnode filter works
 #  quiet
 1e4e1b8f71e0
 #  normal
 1e4e1b8f71e0
 #  verbose
 1e4e1b8f71e0
 #  debug
 1e4e1b8f71e05681d422154f5421e385fec3454f
 # error on syntax
 abort: t:3: unmatched quotes
 # latesttag
 adding file
 adding head1
 adding head2
 created new head
 # No tag set
 5: null+5
 4: null+4
 3: null+3
 2: null+3
 1: null+2
 0: null+1
 # one common tag: longuest path wins
 6: t1+4
 5: t1+3
 4: t1+2
 3: t1+1
 2: t1+1
 1: t1+0
 0: null+1
 # one ancestor tag: more recent wins
 7: t2+3
 6: t2+2
 5: t2+1
 4: t1+2
 3: t1+1
 2: t2+0
 1: t1+0
 0: null+1
 # two branch tags: more recent wins
 8: t3+5
 7: t3+4
 6: t3+3
 5: t3+2
 4: t3+1
 3: t3+0
 2: t2+0
 1: t1+0
 0: null+1
 # merged tag overrides
 10: t5+5
 9: t5+4
 8: t5+3
 7: t5+2
 6: t5+1
 5: t5+0
 4: at3:t3+1
 3: at3:t3+0
 2: t2+0
 1: t1+0
 0: null+1
 # style path expansion (issue1948)
 test 10:dee8f28249af
 # test recursive showlist template (issue1989)
 M|test
 10,test
 branch: test
 # done

tests/test-convert-darcs.out

@@ -1,37 +1,37 b''
 % initialize darcs repo
 Finished recording patch 'p0'
 % branch and update
 Finished recording patch 'p1.1'
 % update source
 Finished recording patch 'p1.2'
 % merge branch
 Backing up ./a(-darcs-backup0)
 We have conflicts in the following files:
 ./a
 Finished pulling and applying.
 Finished recording patch 'p2'
 % test file and directory move
 Finished recording patch 'p3'
 initializing destination darcs-repo-hg repository
 scanning source...
 sorting...
 converting...
 4 p0
 3 p1.2
 2 p1.1
 1 p2
 0 p3
 o  4 "p3" files: dir/d dir/d2 dir2/d f ff
 |
 o  3 "p2" files: a dir/d dir/d2 f
 |
 o  2 "p1.1" files:
 |
 o  1 "p1.2" files: a b
 |
 o  0 "p0" files: a
 
 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
 1e88685f5ddec574a34c70af492f95b6debc8741 644   b
-d278f41640da5fc303a4cf9894af31c2983fc11d 644   dir2/d
-ef5c76581d78340f568d5f48d679bf307452cbc9 644   ff
[phone]adc447ec2385014019599dfec953c806 644   dir2/d
+b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff

tests/test-convert-filemap.out

@@ -1,159 +1,159 b''
 created new head
 created new head
 @  8 "8: change foo" files: foo
 |
 o    7 "7: second merge; change bar" files: bar baz
 |\
 | o  6 "6: change foo baz" files: baz foo
 | |
 o |  5 "5: change bar baz quux" files: bar baz quux
 |/
 o    4 "4: first merge; change bar baz" files: bar baz
 |\
 | o  3 "3: change bar quux" files: bar quux
 | |
 o |  2 "2: change foo" files: foo
 |/
 o  1 "1: add bar quux; copy foo to copied" files: bar copied quux
 |
 o  0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo
 
 % final file versions in this repo:
 9463f52fe115e377cf2878d4fc548117211063f2 644   bar
 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
-6ca237634e1f6bee1b6db94292fb44f092a25842 644   copied
+7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
 3e20847584beff41d7cd16136b7331ab3d754be0 644   dir/file
 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644   dir/file2
 5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir/subdir/file3
 57a1c1511590f3de52874adfa04effe8a77d64af 644   dir/subdir/file4
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 
 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
 @  3 "8: change foo" files: foo
 |
 o  2 "6: change foo baz" files: foo
 |
 o  1 "2: change foo" files: foo
 |
 o  0 "0: add foo baz dir/" files: foo
 
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
 % bar: merges are not merges anymore
 @  4 "7: second merge; change bar" files: bar
 |
 o  3 "5: change bar baz quux" files: bar
 |
 o  2 "4: first merge; change bar baz" files: bar
 |
 o  1 "3: change bar quux" files: bar
 |
 o  0 "1: add bar quux; copy foo to copied" files: bar
 
 9463f52fe115e377cf2878d4fc548117211063f2 644   bar
 % baz: 1st merge is not a merge anymore; 2nd still is
 @    4 "7: second merge; change bar" files: baz
 |\
 | o  3 "6: change foo baz" files: baz
 | |
 o |  2 "5: change bar baz quux" files: baz
 |/
 o  1 "4: first merge; change bar baz" files: baz
 |
 o  0 "0: add foo baz dir/" files: baz
 
 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644   baz
 % foo quux: we add additional merges when they are interesting
 @  8 "8: change foo" files: foo
 |
 o    7 "7: second merge; change bar" files:
 |\
 | o  6 "6: change foo baz" files: foo
 | |
 o |  5 "5: change bar baz quux" files: quux
 |/
 o    4 "4: first merge; change bar baz" files:
 |\
 | o  3 "3: change bar quux" files: quux
 | |
 o |  2 "2: change foo" files: foo
 |/
 o  1 "1: add bar quux; copy foo to copied" files: quux
 |
 o  0 "0: add foo baz dir/" files: foo
 
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
 % bar quux: partial conversion
 @  1 "3: change bar quux" files: bar quux
 |
 o  0 "1: add bar quux; copy foo to copied" files: bar quux
 
 b79105bedc55102f394e90a789c9c380117c1b4a 644   bar
 db0421cc6b685a458c8d86c7d5c004f94429ea23 644   quux
 % bar quux: complete the partial conversion
 @  4 "7: second merge; change bar" files: bar
 |
 o  3 "5: change bar baz quux" files: bar quux
 |
 o  2 "4: first merge; change bar baz" files: bar
 |
 o  1 "3: change bar quux" files: bar quux
 |
 o  0 "1: add bar quux; copy foo to copied" files: bar quux
 
 9463f52fe115e377cf2878d4fc548117211063f2 644   bar
 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644   quux
 % foo: partial conversion
 @  0 "0: add foo baz dir/" files: foo
 
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
 % foo: complete the partial conversion
 @  3 "8: change foo" files: foo
 |
 o  2 "6: change foo baz" files: foo
 |
 o  1 "2: change foo" files: foo
 |
 o  0 "0: add foo baz dir/" files: foo
 
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
 % copied: copied file; source not included in new repo
 @  0 "1: add bar quux; copy foo to copied" files: copied
 
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   copied
 copied not renamed
 % foo copied: copied file; source included in new repo
 @  4 "8: change foo" files: foo
 |
 o  3 "6: change foo baz" files: foo
 |
 o  2 "2: change foo" files: foo
 |
 o  1 "1: add bar quux; copy foo to copied" files: copied
 |
 o  0 "0: add foo baz dir/" files: foo
 
-6ca237634e1f6bee1b6db94292fb44f092a25842 644   copied
+7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644   copied
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo
 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 @  4 "8: change foo" files: foo2
 |
 o  3 "6: change foo baz" files: foo2
 |
 o  2 "2: change foo" files: foo2
 |
 o  1 "1: add bar quux; copy foo to copied" files: copied2
 |
 o  0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2
 
-e5e3d520be9be45937d0b06b004fadcd6c221fa2 644   copied2
+d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644   copied2
 3e20847584beff41d7cd16136b7331ab3d754be0 644   dir2/file
 5fe139720576e18e34bcc9f79174db8897c8afe9 644   dir2/subdir/file3
 9a7b52012991e4873687192c3e17e61ba3e837a3 644   foo2
 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 copied:
 foo
 copied2:
 foo

tests/test-convert-svn-encoding.out

@@ -1,5 +1,5 b''
 % convert while testing all possible outputs
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % check tags are in UTF-8
-'1c1b4062874e8197a68e7ce9e498479a37d0215c branch\xc3\xa9e\n'
-'edc96568720ef79eefa6372677b18d855de3abee branch\xc3\xa9\n'
+'221c3fdaf24df5f14c0a64c597581e2eacfb47bb branch\xc3\xa9e\n'
+'7a40952c2db29cf00d9e31df3749e98d8a4bdcbf branch\xc3\xa9\n'

tests/test-convert-svn-sink.out

@@ -1,337 +1,337 b''
 % add
 adding a
 adding d1/d2/b
 % modify
 1:e0e2b8a9156b
 assuming destination a-hg
 initializing svn repo 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 1 add a file
 0 modify a file
 At revision 2.
  2 2 test .
  2 2 test a
  2 1 test d1
  2 1 test d1/d2
  2 1 test d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/a</path>
 </paths>
 <msg>modify a file</msg>
 </logentry>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/a</path>
 <path
    action="A">/d1</path>
 <path
    action="A">/d1/d2</path>
 <path
    action="A">/d1/d2/b</path>
 </paths>
 <msg>add a file</msg>
 </logentry>
 </log>
 a:
 a
 d1
 
 a-hg-wc:
 a
 d1
 same
 % rename
-2:7009fc4efb34
+2:eb5169441d43
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 rename a file
 At revision 3.
  3 3 test .
  3 3 test b
  3 1 test d1
  3 1 test d1/d2
  3 1 test d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="3">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="D">/a</path>
 <path
    copyfrom-path="/a"
    copyfrom-rev="2"
    action="A">/b</path>
 </paths>
 <msg>rename a file</msg>
 </logentry>
 </log>
 a:
 b
 d1
 
 a-hg-wc:
 b
 d1
 % copy
-3:56c519973ce6
+3:60effef6ab48
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 copy a file
 At revision 4.
  4 4 test .
  4 3 test b
  4 4 test c
  4 1 test d1
  4 1 test d1/d2
  4 1 test d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="4">
 <author>test</author>
 <date/>
 <paths>
 <path
    copyfrom-path="/b"
    copyfrom-rev="3"
    action="A">/c</path>
 </paths>
 <msg>copy a file</msg>
 </logentry>
 </log>
 a:
 b
 c
 d1
 
 a-hg-wc:
 b
 c
 d1
 % remove
-4:ed4dc9a6f585
+4:87bbe3013fb6
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 remove a file
 At revision 5.
  5 5 test .
  5 4 test c
  5 1 test d1
  5 1 test d1/d2
  5 1 test d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="5">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="D">/b</path>
 </paths>
 <msg>remove a file</msg>
 </logentry>
 </log>
 a:
 c
 d1
 
 a-hg-wc:
 c
 d1
 % executable
-5:f205b3636d77
+5:ff42e473c340
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 make a file executable
 At revision 6.
  6 6 test .
  6 6 test c
  6 1 test d1
  6 1 test d1/d2
  6 1 test d1/d2/b
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="6">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/c</path>
 </paths>
 <msg>make a file executable</msg>
 </logentry>
 </log>
 executable
 % executable in new directory
 adding d1/a
 assuming destination a-hg
 initializing svn repo 'a-hg'
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 add executable file in new directory
 At revision 1.
  1 1 test .
  1 1 test d1
  1 1 test d1/a
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/d1</path>
 <path
    action="A">/d1/a</path>
 </paths>
 <msg>add executable file in new directory</msg>
 </logentry>
 </log>
 executable
 % copy to new directory
 assuming destination a-hg
 initializing svn wc 'a-hg-wc'
 scanning source...
 sorting...
 converting...
 0 copy file to new directory
 At revision 2.
  2 2 test .
  2 1 test d1
  2 1 test d1/a
  2 2 test d2
  2 2 test d2/a
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/d2</path>
 <path
    copyfrom-path="/d1/a"
    copyfrom-rev="1"
    action="A">/d2/a</path>
 </paths>
 <msg>copy file to new directory</msg>
 </logentry>
 </log>
 % branchy history
 adding b
 adding left-1
 adding left-2
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 adding right-1
 created new head
 adding right-2
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 merging b
 warning: conflicts during merge.
 merging b failed!
 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 assuming destination b-hg
 initializing svn repo 'b-hg'
 initializing svn wc 'b-hg-wc'
 scanning source...
 sorting...
 converting...
 5 base
 4 left-1
 3 left-2
 2 right-1
 1 right-2
 0 merge
 % expect 4 changes
 At revision 4.
  4 4 test .
  4 3 test b
  4 2 test left-1
  4 3 test left-2
  4 4 test right-1
  4 4 test right-2
 <?xml version="1.0"?>
 <log>
 <logentry
    revision="4">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/right-1</path>
 <path
    action="A">/right-2</path>
 </paths>
 <msg>merge</msg>
 </logentry>
 <logentry
    revision="3">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/b</path>
 <path
    action="A">/left-2</path>
 </paths>
 <msg>left-2</msg>
 </logentry>
 <logentry
    revision="2">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="M">/b</path>
 <path
    action="A">/left-1</path>
 </paths>
 <msg>left-1</msg>
 </logentry>
 <logentry
    revision="1">
 <author>test</author>
 <date/>
 <paths>
 <path
    action="A">/b</path>
 </paths>
 <msg>base</msg>
 </logentry>
 </log>

tests/test-convert-tla.out

@@ -1,72 +1,72 b''
 % create tla archive
 % initialize tla repo
 * creating version tla@mercurial--convert/tla--test--0
 * imported tla@mercurial--convert/tla--test--0
 % create initial files
 A/ .arch-ids
 A/ src
 A/ src/.arch-ids
 A  .arch-ids/a.id
 A  a
 A  src/.arch-ids/=id
 A  src/.arch-ids/b.id
 A  src/b
 * update pristine tree (tla@mercurial--convert/tla--test--0--base-0 => tla--test--0--patch-1)
 * committed tla@mercurial--convert/tla--test--0--patch-1
 % create link file and modify a
 A  src/.arch-ids/a-link.id
 A  src/a-link
 M  a
 * update pristine tree (tla@mercurial--convert/tla--test--0--patch-1 => tla--test--0--patch-2)
 * committed tla@mercurial--convert/tla--test--0--patch-2
 % create second link and modify b
 A  src/.arch-ids/a-link-2.id
 A  src/a-link-2
 Mb src/b
 * update pristine tree (tla@mercurial--convert/tla--test--0--patch-2 => tla--test--0--patch-3)
 * committed tla@mercurial--convert/tla--test--0--patch-3
 % b file to link and a-link-2 to regular file
 fl src/b
 lf src/a-link-2
 * update pristine tree (tla@mercurial--convert/tla--test--0--patch-3 => tla--test--0--patch-4)
 * committed tla@mercurial--convert/tla--test--0--patch-4
 % move a-link-2 file and src directory
 D/ src/.arch-ids
 A/ test/.arch-ids
 /> src	test
 => src/.arch-ids/a-link-2.id	.arch-ids/c.id
 => src/a-link-2	c
 => src/.arch-ids/=id	test/.arch-ids/=id
 => src/.arch-ids/a-link.id	test/.arch-ids/a-link.id
 => src/.arch-ids/b.id	test/.arch-ids/b.id
 * update pristine tree (tla@mercurial--convert/tla--test--0--patch-4 => tla--test--0--patch-5)
 * committed tla@mercurial--convert/tla--test--0--patch-5
 % converting tla repo to Mercurial
 initializing destination tla-repo-hg repository
 analyzing tree version tla@mercurial--convert/tla--test--0...
 scanning source...
 sorting...
 converting...
 5 initial import
 4 added a file, src and src/b (binary)
 3 added link to a and modify a
 2 added second link and modify b
 1 file to link and link to file test
 0 move and rename a-link-2 file and src directory
 % show graph log
 o  5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b
 |
 o  4 "file to link and link to file test" files: src/a-link-2 src/b
 |
 o  3 "added second link and modify b" files: src/a-link-2 src/b
 |
 o  2 "added link to a and modify a" files: a src/a-link
 |
 o  1 "added a file, src and src/b (binary)" files: a src/b
 |
 o  0 "initial import" files:
 
 c4072c4b72e1cabace081888efa148ee80ca3cbb 644   a
-623942606de842342ac7b221ae9ccabc13b5d8c8 644   c
-43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link
-73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b
+0201ac32a3a8e86e303dff60366382a54b48a72e 644   c
+c0067ba5ff0b7c9a3eb17270839d04614c435623 644 @ test/a-link
+375f4263d86feacdea7e3c27100abd1560f2a973 644 @ test/b

tests/test-copy-move-merge.out

@@ -1,37 +1,37 b''
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in other:
    b
    c
   all copies found (* = to merge, ! = divergent):
    c -> a *
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
+ ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
  a: remote moved to c -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving a for resolve of c
 removing a
 update: a 1/2 files (50.00%)
 picked tool 'internal:merge' for b (binary False symlink False)
 merging a and b to b
-my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
+my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
  premerge successful
 update: a 2/2 files (100.00%)
 picked tool 'internal:merge' for c (binary False symlink False)
 merging a and c to c
-my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
+my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -- b --
 0
 1
 2
 -- c --
 0
 1
 2

tests/test-copy.out

@@ -1,52 +1,52 b''
 A b
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-committed changeset 1:386a3cc01532710ca78aed9a54fa2f459c04f29c
+committed changeset 1:76973b01f66a012648546c979ea4c41de9e7d8cd
 we should see two history entries
-changeset:   1:386a3cc01532
+changeset:   1:76973b01f66a
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       b
 description:
 2
 
 
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       a
 description:
 1
 
 
 we should see one log entry for a
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 this should show a revision linked to changeset 0
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 b789fdd96dc2 000000000000 000000000000
 we should see one log entry for b
-changeset:   1:386a3cc01532
+changeset:   1:76973b01f66a
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 this should show a revision linked to changeset 1
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      65      0       1 9a263dd772e0 000000000000 000000000000
+     0         0      65      0       1 37d9b5d994ea 000000000000 000000000000
 this should show the rename information in the metadata
+copy: a
 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-copy: a
-ed156f22f0a6fde642de0b5eba0cbbb2  .hg/store/data/b.i
+4999f120a3b88713bbefddd195cf5133  .hg/store/data/b.i
 60b725f10c9c85c70d97880dfe8191b3  bsum
 60b725f10c9c85c70d97880dfe8191b3  asum
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions

tests/test-copy2.out

@@ -1,47 +1,47 b''
 # should fail - foo is not managed
 foo: not copying - file is not managed
 abort: no files to copy
 ? foo
 # dry-run; print a warning that this is not a real copy; foo is added
 foo has not been committed yet, so no copy data will be stored for bar.
 A foo
 # should print a warning that this is not a real copy; bar is added
 foo has not been committed yet, so no copy data will be stored for bar.
 A bar
 # should print a warning that this is not a real copy; foo is added
 bar has not been committed yet, so no copy data will be stored for foo.
 A foo
 # dry-run; should show that foo is clean
 C foo
 # should show copy
 A bar
   foo
 # shouldn't show copy
 # should match
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
 # should not be renamed
 bar not renamed
 # should show copy
 M bar
   foo
 # should show no parents for tip
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      69      0       1 6ca237634e1f 000000000000 000000000000
-     1        69       6      1       2 7a1ff8e75f5b 6ca237634e1f 000000000000
-     2        75      82      1       3 243dfe60f3d9 000000000000 000000000000
+     0         0      69      0       1 7711d36246cc 000000000000 000000000000
+     1        69       6      1       2 bdf70a2b8d03 7711d36246cc 000000000000
+     2        75      81      1       3 b2558327ea8d 000000000000 000000000000
 # should match
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
      1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
 # should show no copies
 # copy --after on an added file
 A baz
   bar
 # foo was clean:
 C foo
 # but it's considered modified after a copy --after --force
 M foo
   bar

tests/test-debugrename.out

@@ -1,5 +1,5 b''
 adding a
 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
-a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f
+a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980
 % test with --rev
 b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

tests/test-double-merge.out

@@ -1,39 +1,39 b''
 created new head
-changeset:   1:7731dad1c2b9
+changeset:   1:d9da848d0adf
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     cp foo bar; change both
 
   searching for copies back to rev 1
   unmatched files in other:
    bar
   all copies found (* = to merge, ! = divergent):
    bar -> foo *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
+ ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf
  foo: versions differ -> m
  foo: remote copied to bar -> m
 preserving foo for resolve of bar
 preserving foo for resolve of foo
 update: foo 1/2 files (50.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging foo and bar to bar
-my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da
+my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da
  premerge successful
 update: foo 2/2 files (100.00%)
 picked tool 'internal:merge' for foo (binary False symlink False)
 merging foo
-my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da
+my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -- foo --
 line 0
 line 1
 line 2-1
 -- bar --
 line 0
 line 1
 line 2-2

tests/test-hgweb-filelog.out

@@ -1,605 +1,605 b''
 adding b
 adding a
 adding a
-changeset:   6:38d962e6234d
+changeset:   6:b7682196df1c
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     change c
 
-diff -r a3b6a9e4507e -r 38d962e6234d c
+diff -r 1a6696706df2 -r b7682196df1c c
 --- a/c	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +1,2 @@
  b
 +c
 
-changeset:   5:a3b6a9e4507e
+changeset:   5:1a6696706df2
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     mv b
 
-diff -r 52e848cdcd88 -r a3b6a9e4507e b
+diff -r 52e848cdcd88 -r 1a6696706df2 b
 --- a/b	Thu Jan 01 00:00:00 1970 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +0,0 @@
 -b
-diff -r 52e848cdcd88 -r a3b6a9e4507e c
+diff -r 52e848cdcd88 -r 1a6696706df2 c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 changeset:   4:52e848cdcd88
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     del2 a
 
 diff -r 01de2d66a28d -r 52e848cdcd88 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +0,0 @@
 -b
 
 changeset:   3:01de2d66a28d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     second a
 
 diff -r be3ebcc91739 -r 01de2d66a28d a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 changeset:   2:be3ebcc91739
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     del a
 
 diff -r 5ed941583260 -r be3ebcc91739 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +0,0 @@
 -a
 
 changeset:   1:5ed941583260
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     first a
 
 diff -r 6563da9dcf87 -r 5ed941583260 a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 changeset:   0:6563da9dcf87
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 diff -r 000000000000 -r 6563da9dcf87 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 % tip - two revisions
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a history</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log/tip/a" title="Atom feed for test:a" />
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log/tip/a" title="RSS feed for test:a" />
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/01de2d66a28d">log</a></li>
 <li><a href="/graph/01de2d66a28d">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/01de2d66a28d">changeset</a></li>
 <li><a href="/file/01de2d66a28d">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/01de2d66a28d/a">file</a></li>
 <li><a href="/diff/01de2d66a28d/a">diff</a></li>
 <li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
 <li class="active">file log</li>
 <li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>log a</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="navigate">
 <a href="/log/01de2d66a28d/a?revcount=30">less</a>
 <a href="/log/01de2d66a28d/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
 
 <table class="bigtable">
  <tr>
   <th class="age">age</th>
   <th class="author">author</th>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
  </tr>
  <tr class="parity1">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
 
 </table>
 
 <div class="navigate">
 <a href="/log/01de2d66a28d/a?revcount=30">less</a>
 <a href="/log/01de2d66a28d/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> 
 </div>
 
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % second version - two revisions
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a history</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log/tip/a" title="Atom feed for test:a" />
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log/tip/a" title="RSS feed for test:a" />
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/01de2d66a28d">log</a></li>
 <li><a href="/graph/01de2d66a28d">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/01de2d66a28d">changeset</a></li>
 <li><a href="/file/01de2d66a28d">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/01de2d66a28d/a">file</a></li>
 <li><a href="/diff/01de2d66a28d/a">diff</a></li>
 <li><a href="/annotate/01de2d66a28d/a">annotate</a></li>
 <li class="active">file log</li>
 <li><a href="/raw-file/01de2d66a28d/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>log a</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="navigate">
 <a href="/log/01de2d66a28d/a?revcount=30">less</a>
 <a href="/log/01de2d66a28d/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
 
 <table class="bigtable">
  <tr>
   <th class="age">age</th>
   <th class="author">author</th>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/01de2d66a28d">second a</a></td>
  </tr>
  <tr class="parity1">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
 
 </table>
 
 <div class="navigate">
 <a href="/log/01de2d66a28d/a?revcount=30">less</a>
 <a href="/log/01de2d66a28d/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> 
 </div>
 
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % first deleted - one revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a history</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log/tip/a" title="Atom feed for test:a" />
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log/tip/a" title="RSS feed for test:a" />
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/5ed941583260">log</a></li>
 <li><a href="/graph/5ed941583260">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/5ed941583260">changeset</a></li>
 <li><a href="/file/5ed941583260">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/5ed941583260/a">file</a></li>
 <li><a href="/diff/5ed941583260/a">diff</a></li>
 <li><a href="/annotate/5ed941583260/a">annotate</a></li>
 <li class="active">file log</li>
 <li><a href="/raw-file/5ed941583260/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>log a</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="navigate">
 <a href="/log/5ed941583260/a?revcount=30">less</a>
 <a href="/log/5ed941583260/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
 
 <table class="bigtable">
  <tr>
   <th class="age">age</th>
   <th class="author">author</th>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
 
 </table>
 
 <div class="navigate">
 <a href="/log/5ed941583260/a?revcount=30">less</a>
 <a href="/log/5ed941583260/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> 
 </div>
 
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % first version - one revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a history</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log/tip/a" title="Atom feed for test:a" />
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log/tip/a" title="RSS feed for test:a" />
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/5ed941583260">log</a></li>
 <li><a href="/graph/5ed941583260">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/5ed941583260">changeset</a></li>
 <li><a href="/file/5ed941583260">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/5ed941583260/a">file</a></li>
 <li><a href="/diff/5ed941583260/a">diff</a></li>
 <li><a href="/annotate/5ed941583260/a">annotate</a></li>
 <li class="active">file log</li>
 <li><a href="/raw-file/5ed941583260/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>log a</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="navigate">
 <a href="/log/5ed941583260/a?revcount=30">less</a>
 <a href="/log/5ed941583260/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
 
 <table class="bigtable">
  <tr>
   <th class="age">age</th>
   <th class="author">author</th>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
   <td class="age">1970-01-01</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/5ed941583260">first a</a></td>
  </tr>
 
 </table>
 
 <div class="navigate">
 <a href="/log/5ed941583260/a?revcount=30">less</a>
 <a href="/log/5ed941583260/a?revcount=120">more</a>
 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> 
 </div>
 
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % before addition - error
 404 Not Found
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: error</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog">log</a></li>
 <li><a href="/graph">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>error</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30"></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">
 <p>
 An error occurred while processing your request:
 </p>
 <p>
 a@6563da9dcf87: not found in manifest
 </p>
 </div>
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % should show base link, use spartan because it shows it
 200 Script output follows
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png">
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style.css" type="text/css" />
 
 <title>test: c history</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log/tip/c" title="Atom feed for test:c">
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log/tip/c" title="RSS feed for test:c">
 </head>
 <body>
 
 <div class="buttons">
 <a href="/log?style=spartan">changelog</a>
 <a href="/shortlog?style=spartan">shortlog</a>
 <a href="/graph?style=spartan">graph</a>
 <a href="/tags?style=spartan">tags</a>
 <a href="/branches?style=spartan">branches</a>
-<a href="/file/38d962e6234d/c?style=spartan">file</a>
-<a href="/annotate/38d962e6234d/c?style=spartan">annotate</a>
+<a href="/file/b7682196df1c/c?style=spartan">file</a>
+<a href="/annotate/b7682196df1c/c?style=spartan">annotate</a>
 <a type="application/rss+xml" href="/rss-log/tip/c">rss</a>
 <a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a>
 </div>
 
 <h2>c revision history</h2>
 
-<p>navigate: <small class="navigate"><a href="/log/a3b6a9e4507e/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p>
+<p>navigate: <small class="navigate"><a href="/log/1a6696706df2/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p>
 
 <table class="logEntry parity0">
  <tr>
   <th class="age">1970-01-01:</th>
-  <th class="firstline"><a href="/rev/38d962e6234d?style=spartan">change c</a></th>
+  <th class="firstline"><a href="/rev/b7682196df1c?style=spartan">change c</a></th>
  </tr>
  <tr>
   <th class="revision">revision 1:</td>
   <td class="node">
-   <a href="/file/38d962e6234d/c?style=spartan">38d962e6234d</a>
-   <a href="/diff/38d962e6234d/c?style=spartan">(diff)</a>
-   <a href="/annotate/38d962e6234d/c?style=spartan">(annotate)</a>
+   <a href="/file/b7682196df1c/c?style=spartan">b7682196df1c</a>
+   <a href="/diff/b7682196df1c/c?style=spartan">(diff)</a>
+   <a href="/annotate/b7682196df1c/c?style=spartan">(annotate)</a>
   </td>
  </tr>
  
  <tr>
   <th class="author">author:</th>
   <td class="author">&#116;&#101;&#115;&#116;</td>
  </tr>
  <tr>
   <th class="date">date:</th>
   <td class="date">Thu Jan 01 00:00:00 1970 +0000</td>
  </tr>
 </table>
 
 
 <table class="logEntry parity1">
  <tr>
   <th class="age">1970-01-01:</th>
-  <th class="firstline"><a href="/rev/a3b6a9e4507e?style=spartan">mv b</a></th>
+  <th class="firstline"><a href="/rev/1a6696706df2?style=spartan">mv b</a></th>
  </tr>
  <tr>
   <th class="revision">revision 0:</td>
   <td class="node">
-   <a href="/file/a3b6a9e4507e/c?style=spartan">a3b6a9e4507e</a>
-   <a href="/diff/a3b6a9e4507e/c?style=spartan">(diff)</a>
-   <a href="/annotate/a3b6a9e4507e/c?style=spartan">(annotate)</a>
+   <a href="/file/1a6696706df2/c?style=spartan">1a6696706df2</a>
+   <a href="/diff/1a6696706df2/c?style=spartan">(diff)</a>
+   <a href="/annotate/1a6696706df2/c?style=spartan">(annotate)</a>
   </td>
  </tr>
  
 <tr>
 <th>base:</th>
 <td>
 <a href="/file/1e88685f5dde/b?style=spartan">
 b@1e88685f5dde
 </a>
 </td>
 </tr>
  <tr>
   <th class="author">author:</th>
   <td class="author">&#116;&#101;&#115;&#116;</td>
  </tr>
  <tr>
   <th class="date">date:</th>
   <td class="date">Thu Jan 01 00:00:00 1970 +0000</td>
  </tr>
 </table>
 
 
 
 
 
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
 
 </body>
 </html>
 
 % errors

tests/test-http-clone-r.out

@@ -1,193 +1,193 b''
 # creating 'remote'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       7 905359268f77 000000000000 000000000000
+     0         0      75      0       7 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       8 905359268f77 000000000000 000000000000
+     0         0      75      0       8 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
-     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
-     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
+     5       250      68      3       7 09bb521d218d de68e904d169 000000000000
+     6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 # Starting server
 # clone remote via stream
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 2 total revisions
 pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 6 changesets with 5 changes to 4 files
 (run 'hg update' to get a working copy)
 pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 5 changesets, 3 total revisions
 pulling from http://localhost:$HGPORT/
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-issue1175.out

@@ -1,25 +1,25 b''
 adding a
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 warning: detected divergent renames of a to:
  a2
  a1
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding a
 b
  b: searching for copy revision for a
  b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
-committed changeset 5:755e75751bf67eb4378bca61987df035d90a7a06
+committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 6 changesets, 4 total revisions
 # HG changeset patch
 # User test
 # Date 0 0
-# Node ID 755e75751bf67eb4378bca61987df035d90a7a06
-# Parent  7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d
+# Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
+# Parent  7fc86ba705e717a721dbc361bf8c9bc05a18ca2f
 5
 
 diff --git a/b b/b
 new file mode 100644

tests/test-issue672.out

@@ -1,62 +1,62 b''
 adding 1
 adding 2
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
   searching for copies back to rev 1
   unmatched files in other:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
+ ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
  1: other deleted -> r
  1a: remote created -> g
 update: 1 1/2 files (50.00%)
 removing 1
 update: 1a 2/2 files (100.00%)
 getting 1a
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in local:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
+ ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
  1a: local copied/moved to 1 -> m
 preserving 1a for resolve of 1a
 update: 1a 1/1 files (100.00%)
 picked tool 'internal:merge' for 1a (binary False symlink False)
 merging 1a and 1 to 1a
-my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
+my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in other:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
+ ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
  1: remote moved to 1a -> m
 preserving 1 for resolve of 1a
 removing 1
 update: 1 1/1 files (100.00%)
 picked tool 'internal:merge' for 1a (binary False symlink False)
 merging 1 and 1a to 1a
-my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
+my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)

tests/test-keyword.out

@@ -1,480 +1,480 b''
 % hg kwdemo
 [extensions]
 keyword = 
 [keyword]
 demo.txt = 
 [keywordmaps]
 Author = {author|user}
 Date = {date|utcdate}
 Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
 Id = {file|basename},v {node|short} {date|utcdate} {author|user}
 RCSFile = {file|basename},v
 RCSfile = {file|basename},v
 Revision = {node|short}
 Source = {root}/{file},v
 $Author: test $
 $Date: 2000/00/00 00:00:00 $
 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $RCSFile: demo.txt,v $
 $RCSfile: demo.txt,v $
 $Revision: xxxxxxxxxxxx $
 $Source: /TMP/demo.txt,v $
 [extensions]
 keyword = 
 [keyword]
 demo.txt = 
 [keywordmaps]
 Branch = {branches}
 $Branch: demobranch $
 % kwshrink should exit silently in empty/invalid repo
 pulling from test-keyword.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 ignore $Id$
 % no kwfiles
 % untracked candidates
 k a
 % addremove
 adding a
 adding b
 % status
 A a
 A b
 % default keyword expansion including commit hook
 % interrupted commit should not change state or run commit hook
 abort: empty commit message
 % status
 A a
 A b
 % commit
 a
 b
 overwriting a expanding keywords
 running hook commit.test: cp a hooktest
 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
 % status
 ? hooktest
 % identify
 ef63ca68695b
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % diff a hooktest
 % removing commit hook from config
 % bundle
 2 changesets found
 % notify on pull to check whether keywords stay as is in email
 % ie. if patch.diff wrapper acts as it should
 % pull from bundle
 pulling from ../kw.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 
 diff -r 000000000000 -r a2392c293916 sym
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
 @@ -0,0 +1,1 @@
 +a
 \ No newline at end of file
 
 diff -r a2392c293916 -r ef63ca68695b a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 diff -r a2392c293916 -r ef63ca68695b b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +ignore $Id$
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % remove notify config
 % touch
 % status
 % update
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % check whether expansion is filewise
 % commit c
 adding c
 % force expansion
 overwriting a expanding keywords
 overwriting c expanding keywords
 % compare changenodes in a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qinit -c
 % qimport
 % qcommit
 % keywords should not be expanded in patch
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 1 0
 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
 # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
 cndiff
 
 diff -r ef63ca68695b -r 40a904bbbe4c c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,2 @@
 +$Id$
 +tests for different changenodes
 % qpop
 popping mqtest.diff
 patch queue now empty
 % qgoto - should imply qpush
 applying mqtest.diff
 now at: mqtest.diff
 % cat
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qpop and move on
 popping mqtest.diff
 patch queue now empty
 % copy
 % kwfiles added
 a
 c
 % commit
 c
  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 overwriting c expanding keywords
-committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f
+committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
 % cat a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
-expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $
+expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
 do not process $Id:
 xxx $
 % touch copied c
 % status
 % kwfiles
 a
 c
 % ignored files
 I b
 I sym
 % all files
 K a
 K c
 I b
 I sym
 % diff --rev
 diff -r ef63ca68695b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 % rollback
 rolling back last transaction
 % status
 A c
 % update -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % custom keyword expansion
 % try with kwdemo
 [extensions]
 keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 Xinfo = {author}: {desc}
 $Xinfo: test: hg keyword config and expansion example $
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % interrupted commit should not change state
 abort: empty commit message
 % status
 M a
 ? c
 ? log
 % commit
 a
 overwriting a expanding keywords
 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
 ? c
 % verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 3 changesets, 4 total revisions
 % cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % annotate
 1: expand $Id$
 1: do not process $Id:
 1: xxx $
 2: $Xinfo$
 % remove
 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 ? c
 % rollback
 rolling back last transaction
 % status
 R a
 ? c
 % revert a
 % cat a
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % clone to test incoming
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
 comparing with test-keyword/Test
 searching for changes
 changeset:   2:bb948857c743
 tag:         tip
 user:        User Name <[e-mail]>
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
 % commit rejecttest
 a
 overwriting a expanding keywords
 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
 % export
 % import
 applying ../rejecttest.diff
 % cat
 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 do not process $Id: rejecttest
 xxx $
 $Xinfo: User Name <[e-mail]>: rejects? $
 ignore $Id$
 
 % rollback
 rolling back last transaction
 % clean update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % kwexpand/kwshrink on selected files
 % copy a x/a
 % kwexpand a
 overwriting a expanding keywords
 % kwexpand x/a should abort
 abort: outstanding uncommitted changes
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
-committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e
+committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
 % cat a
-expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
+expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: xa $
 % kwshrink a inside directory x
 overwriting x/a shrinking keywords
 % cat a
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 % kwexpand nonexistent
 nonexistent:
 % hg serve
 % expansion
 % hgweb file
 200 Script output follows
 
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % no expansion
 % hgweb annotate
 200 Script output follows
 
 
 user@1: expand $Id$
 user@1: do not process $Id:
 user@1: xxx $
 user@2: $Xinfo$
 
 
 
 
 % hgweb changeset
 200 Script output follows
 
 
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 3 0
-# Node ID cfa68229c1167443337266ebac453c73b1d5d16e
+# Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
 # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
-diff -r bb948857c743 -r cfa68229c116 x/a
+diff -r bb948857c743 -r b4560182a3f9 x/a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,4 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 +$Xinfo$
 
 % hgweb filediff
 200 Script output follows
 
 
 diff -r ef63ca68695b -r bb948857c743 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
 @@ -1,3 +1,4 @@
  expand $Id$
  do not process $Id:
  xxx $
 +$Xinfo$
 
 
 
 
 % errors encountered
 % merge/resolve
 % simplemerge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $
+$Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
 foo
 % conflict
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging m
 warning: conflicts during merge.
 merging m failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 % keyword stays outside conflict zone
 $Id$
 <<<<<<< local
 bar
 =======
 foo
 >>>>>>> other
 % resolve to local
-$Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $
+$Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $
 bar
 % test restricted mode with transplant -b
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch foo
 created new head
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-applying 1c4378f51c4d
-1c4378f51c4d transplanted to 7d855abcab87
+applying 4aa30d025d50
+4aa30d025d50 transplanted to 5a4da427c162
 % no expansion in changeset
-changeset:   11:7d855abcab87
+changeset:   11:5a4da427c162
 tag:         tip
-parent:      9:43dfd2854b5b
+parent:      9:41efa6d38e9b
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     9foobranch
 
-diff -r 43dfd2854b5b -r 7d855abcab87 a
+diff -r 41efa6d38e9b -r 5a4da427c162 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,3 +1,4 @@
 +foobranch
  expand $Id$
  do not process $Id:
  xxx $
 
 % expansion in file
 foobranch
-expand $Id: a 7d855abcab87 Thu, 01 Jan 1970 00:00:00 +0000 test $
+expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $
 % switch off expansion
 % kwshrink with unknown file u
 overwriting a shrinking keywords
 overwriting m shrinking keywords
 overwriting x/a shrinking keywords
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 a

tests/test-log.out

@@ -1,278 +1,278 b''
 adding a
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 % -f, directory
 abort: cannot follow nonexistent file: "dir"
 % -f, but no args
-changeset:   4:b30c444c7c84
+changeset:   4:66c1345dc4f9
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     e
 
-changeset:   3:16b60bf3f99a
+changeset:   3:7c6c671bb7cc
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     d
 
-changeset:   2:21fba396af4c
+changeset:   2:41dd4284081e
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     c
 
-changeset:   1:c0296dabce9b
+changeset:   1:784de7cef101
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     b
 
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 % one rename
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       a
 description:
 a
 
 
 % many renames
-changeset:   4:b30c444c7c84
+changeset:   4:66c1345dc4f9
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 files:       dir/b e
 description:
 e
 
 
-changeset:   2:21fba396af4c
+changeset:   2:41dd4284081e
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 files:       b dir/b
 description:
 c
 
 
-changeset:   1:c0296dabce9b
+changeset:   1:784de7cef101
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 files:       b
 description:
 b
 
 
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       a
 description:
 a
 
 
 % log copies with --copies
 4 e (dir/b)
 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
 % log copies switch without --copies, with old filecopy template
 4 
 3 
 2 
 1 
 0 
 % log copies switch with --copies
 4 e (dir/b)
 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
 % log copies, non-linear manifest
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding foo
 created new head
 5 e (dir/b)
 % log copies, execute bit set
 6 
 % log -p d
-changeset:   3:16b60bf3f99a
+changeset:   3:7c6c671bb7cc
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 files:       a b d
 description:
 d
 
 
-diff -r 21fba396af4c -r 16b60bf3f99a d
+diff -r 41dd4284081e -r 7c6c671bb7cc d
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/d	Thu Jan 01 00:00:04 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 adding base
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b1
 created new head
 % log -f
 changeset:   3:e62f78d544b4
 tag:         tip
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding b2
 created new head
 % log -f -r 1:tip
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   2:60c670bf5b30
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r2
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % log -r . with two parents
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 % log -r . with one parent
 changeset:   5:302e9dd6890d
 tag:         tip
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 % log --follow-first
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 changeset:   5:302e9dd6890d
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
 % log -P 2
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 changeset:   5:302e9dd6890d
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 changeset:   4:ddb82e70d1a1
 parent:      0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b2
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 % log -r tip -p --git
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 diff --git a/b1 b/b1
 --- a/b1
 +++ b/b1
 @@ -1,1 +1,2 @@
  b1
 +postm
 
 % log -r ""
 abort: 00changelog.i@: ambiguous identifier!
 % log -r <some unknown node id>
 abort: unknown revision '1000000000000000000000000000000000000000'!
 % log -k r1
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 % log -d -1
 adding a
 adding b
 changeset:   0:29a4c94f1924
 user:        User One <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 changeset:   1:e834b5e69c0e
 tag:         tip
 user:        User Two <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:29a4c94f1924
 user:        User One <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 

tests/test-merge-commit.out

@@ -1,96 +1,96 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging bar and foo to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line0 line1 line2
 line0
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      77      0       2 da78c0659611 000000000000 000000000000
-     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
+     0         0      77      0       2 d35118874825 000000000000 000000000000
+     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 690b295714ae 000000000000 000000000000
      1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-4:2d2f9a22c82b 2:0a3ab4856510 
-3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d 
-2:0a3ab4856510 0:2665aaee66e9 
+4:2263c1be0967 2:0f2ff26688b9 
+3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 
+2:0f2ff26688b9 0:2665aaee66e9 
 1:5cd961e4045d 
 0:2665aaee66e9 
 % this should use bar@rev2 as the ancestor
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
+ ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
  bar: versions differ -> m
 preserving bar for resolve of bar
 update: bar 1/1 files (100.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging bar
-my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
+my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line1 line2
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      77      0       2 da78c0659611 000000000000 000000000000
-     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
-     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
-     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b
+     0         0      77      0       2 d35118874825 000000000000 000000000000
+     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
+     2       153       7      2       4 ff4b45017382 d35118874825 000000000000
+     3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 2 files (+1 heads)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging foo and bar to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line0 line1 line2
 line0
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      77      0       2 da78c0659611 000000000000 000000000000
-     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
+     0         0      77      0       2 d35118874825 000000000000 000000000000
+     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 690b295714ae 000000000000 000000000000
      1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-4:2d2f9a22c82b 2:0a3ab4856510 
-3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 
-2:0a3ab4856510 0:2665aaee66e9 
+4:2263c1be0967 2:0f2ff26688b9 
+3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 
+2:0f2ff26688b9 0:2665aaee66e9 
 1:5cd961e4045d 
 0:2665aaee66e9 
 % this should use bar@rev2 as the ancestor
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897
+ ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
  bar: versions differ -> m
 preserving bar for resolve of bar
 update: bar 1/1 files (100.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging bar
-my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510
+my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line1 line2
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      77      0       2 da78c0659611 000000000000 000000000000
-     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
-     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
-     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b
+     0         0      77      0       2 d35118874825 000000000000 000000000000
+     1        77      76      0       3 5345f5ab8abd 000000000000 d35118874825
+     2       153       7      2       4 ff4b45017382 d35118874825 000000000000
+     3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd

tests/test-merge10.out

@@ -1,20 +1,20 b''
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging testdir/subdir/a and testdir/a to testdir/subdir/a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M testdir/subdir/a
-diff -r d02b3fc32762 testdir/subdir/a
+diff -r f7459795031e testdir/subdir/a
 --- a/testdir/subdir/a
 +++ b/testdir/subdir/a
 @@ -1,1 +1,1 @@
 -a
 +alpha

tests/test-mq-git.out

@@ -1,110 +1,110 b''
 % git=auto: regular patch creation
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff -r 000000000000 -r ef8dafc9fa4c a
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,1 @@
 +a
 % git=auto: git patch creation with copy
 # HG changeset patch
 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
 diff --git a/a b/b
 copy from a
 copy to b
 % git=auto: git patch when using --git
 # HG changeset patch
-# Parent 2962f232b49d41ebc26c591ec8d556724be213ab
+# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
 # Date 0 0
 
 diff --git a/regular b/regular
 new file mode 100644
 --- /dev/null
 +++ b/regular
 @@ -0,0 +1,1 @@
 +regular
 % git=auto: regular patch after qrefresh without --git
 # HG changeset patch
-# Parent 2962f232b49d41ebc26c591ec8d556724be213ab
+# Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
 # Date 0 0
 
-diff -r 2962f232b49d regular
+diff -r 99586d5f048c regular
 --- /dev/null
 +++ b/regular
 @@ -0,0 +1,1 @@
 +regular
 % git=keep: git patch with --git
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
 new file mode 100644
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,1 @@
 +a
 % git=keep: git patch after qrefresh without --git
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
 new file mode 100644
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,2 @@
 +a
 +a
 % git=yes: git patch
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
 new file mode 100644
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,1 @@
 +a
 % git=yes: git patch after qrefresh
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
 new file mode 100644
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,2 @@
 +a
 +a
 % git=no: regular patch with copy
 # HG changeset patch
 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
-diff -r ef8dafc9fa4c -r 110cde11d262 b
+diff -r ef8dafc9fa4c -r a70404f79ba3 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a
 % git=no: regular patch after qrefresh with copy
 # HG changeset patch
 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
 diff -r ef8dafc9fa4c b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a
 diff -r ef8dafc9fa4c c
 --- /dev/null
 +++ b/c
 @@ -0,0 +1,1 @@
 +a

tests/test-push-r.out

@@ -1,138 +1,138 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       7 905359268f77 000000000000 000000000000
+     0         0      75      0       7 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       8 905359268f77 000000000000 000000000000
+     0         0      75      0       8 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
-     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
-     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
+     5       250      68      3       7 09bb521d218d de68e904d169 000000000000
+     6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 pushing to test-0
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 pushing to test-1
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 pushing to test-2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 pushing to test-3
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 pushing to test-4
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 pushing to test-5
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 pushing to test-6
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 pushing to test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
 pushing to test-8
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-record.out

@@ -1,595 +1,595 b''
 % help
 hg record [OPTION]... [FILE]...
 
 interactively select changes to commit
 
     If a list of files is omitted, all changes reported by "hg status" will be
     candidates for recording.
 
     See 'hg help dates' for a list of formats valid for -d/--date.
 
     You will be prompted for whether to record changes to each modified file,
     and for files with multiple changes, for each change to use. For each
     query, the following responses are possible:
 
       y - record this change
       n - skip this change
 
       s - skip remaining changes to this file
       f - record remaining changes to this file
 
       d - done, skip remaining changes and files
       a - record all changes to all remaining files
       q - quit, recording no changes
 
       ? - display help
 
 options:
 
  -A --addremove     mark new/missing files as added/removed before committing
     --close-branch  mark a branch as closed, hiding it from the branch list
  -I --include       include names matching the given patterns
  -X --exclude       exclude names matching the given patterns
  -m --message       use <text> as commit message
  -l --logfile       read commit message from <file>
  -d --date          record datecode as commit date
  -u --user          record the specified user as committer
 
 use "hg -v help record" to show global options
 % select no files
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record
 
 changeset:   -1:000000000000
 tag:         tip
 user:        
 date:        Thu Jan 01 00:00:00 1970 +0000
 
 
 % select files but no hunks
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message
 
 changeset:   -1:000000000000
 tag:         tip
 user:        
 date:        Thu Jan 01 00:00:00 1970 +0000
 
 
 % record empty file
 diff --git a/empty-rw b/empty-rw
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?] 
 changeset:   0:c0708cf4e46e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     empty
 
 
 % rename empty file
 diff --git a/empty-rw b/empty-rename
 rename from empty-rw
 rename to empty-rename
 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] 
-changeset:   1:df251d174da3
+changeset:   1:d695e8dcb197
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     rename
 
 
 % copy empty file
 diff --git a/empty-rename b/empty-copy
 copy from empty-rename
 copy to empty-copy
 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] 
-changeset:   2:b63ea3939f8d
+changeset:   2:1d4b90bea524
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     copy
 
 
 % delete empty file
 diff --git a/empty-copy b/empty-copy
 deleted file mode 100644
 examine changes to 'empty-copy'? [Ynsfdaq?] 
-changeset:   3:a2546574bce9
+changeset:   3:b39a238f01a1
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     delete
 
 
 % add binary file
 1 changesets found
 diff --git a/tip.bundle b/tip.bundle
 new file mode 100644
 this is a binary file
 examine changes to 'tip.bundle'? [Ynsfdaq?] 
-changeset:   4:9e998a545a8b
+changeset:   4:ad816da3711e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     binary
 
-diff -r a2546574bce9 -r 9e998a545a8b tip.bundle
+diff -r b39a238f01a1 -r ad816da3711e tip.bundle
 Binary file tip.bundle has changed
 
 % change binary file
 1 changesets found
 diff --git a/tip.bundle b/tip.bundle
 this modifies a binary file (all or nothing)
 examine changes to 'tip.bundle'? [Ynsfdaq?] 
-changeset:   5:93d05561507d
+changeset:   5:dccd6f3eb485
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     binary-change
 
-diff -r 9e998a545a8b -r 93d05561507d tip.bundle
+diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
 Binary file tip.bundle has changed
 
 % rename and change binary file
 1 changesets found
 diff --git a/tip.bundle b/top.bundle
 rename from tip.bundle
 rename to top.bundle
 this modifies a binary file (all or nothing)
 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] 
-changeset:   6:699cc1bea9aa
+changeset:   6:7fa44105f5b3
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     binary-change-rename
 
-diff -r 93d05561507d -r 699cc1bea9aa tip.bundle
+diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
 Binary file tip.bundle has changed
-diff -r 93d05561507d -r 699cc1bea9aa top.bundle
+diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
 Binary file top.bundle has changed
 
 % add plain file
 diff --git a/plain b/plain
 new file mode 100644
 examine changes to 'plain'? [Ynsfdaq?] 
-changeset:   7:118ed744216b
+changeset:   7:11fb457c1be4
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:07 1970 +0000
 summary:     plain
 
-diff -r 699cc1bea9aa -r 118ed744216b plain
+diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:07 1970 +0000
 @@ -0,0 +1,10 @@
 +1
 +2
 +3
 +4
 +5
 +6
 +7
 +8
 +9
 +10
 
 % modify end of plain file
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@
  8
  9
  10
 +11
 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL
 diff --git a/plain b/plain
 1 hunks, 1 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@
  9
  10
  11
-+cf81a2760718a74d44c0c2eecb72f659e63a69c5
++7264f99c5f5ff3261504828afa4fb4d406c3af54
 \ No newline at end of file
 record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@
  9
  10
  11
--cf81a2760718a74d44c0c2eecb72f659e63a69c5
+-7264f99c5f5ff3261504828afa4fb4d406c3af54
 \ No newline at end of file
-+cf81a2760718a74d44c0c2eecb72f659e63a69c5
++7264f99c5f5ff3261504828afa4fb4d406c3af54
 record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@
  8
  9
  10
 -11
--cf81a2760718a74d44c0c2eecb72f659e63a69c5
+-7264f99c5f5ff3261504828afa4fb4d406c3af54
 record change 2/2 to 'plain'? [Ynsfdaq?] 
-changeset:   11:d09ab1967dab
+changeset:   11:efca65c9b09e
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:10 1970 +0000
 summary:     begin-and-end
 
-diff -r e2ecd9b0b78d -r d09ab1967dab plain
+diff -r cd07d48e8cbe -r efca65c9b09e plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
 @@ -1,4 +1,4 @@
 -1
 +2
  2
  3
  4
 @@ -8,5 +8,3 @@
  8
  9
  10
 -11
--cf81a2760718a74d44c0c2eecb72f659e63a69c5
+-7264f99c5f5ff3261504828afa4fb4d406c3af54
 
 % trim beginning, modify end
 % record end
 diff --git a/plain b/plain
 2 hunks, 5 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@
 -2
 -2
 -3
  4
  5
  6
  7
  8
  9
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@
  4
  5
  6
  7
  8
  9
 -10
 +10.new
 record change 2/2 to 'plain'? [Ynsfdaq?] 
-changeset:   12:44516c9708ae
+changeset:   12:7d1e66983c15
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:11 1970 +0000
 summary:     end-only
 
-diff -r d09ab1967dab -r 44516c9708ae plain
+diff -r efca65c9b09e -r 7d1e66983c15 plain
 --- a/plain	Thu Jan 01 00:00:10 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
 @@ -7,4 +7,4 @@
  7
  8
  9
 -10
 +10.new
 
 % record beginning
 diff --git a/plain b/plain
 1 hunks, 3 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@
 -2
 -2
 -3
  4
  5
  6
 record this change to 'plain'? [Ynsfdaq?] 
-changeset:   13:3ebbace64a8d
+changeset:   13:a09fc62a0e61
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:12 1970 +0000
 summary:     begin-only
 
-diff -r 44516c9708ae -r 3ebbace64a8d plain
+diff -r 7d1e66983c15 -r a09fc62a0e61 plain
 --- a/plain	Thu Jan 01 00:00:11 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
 @@ -1,6 +1,3 @@
 -2
 -2
 -3
  4
  5
  6
 
 % add to beginning, trim from end
 % record end
 diff --git a/plain b/plain
 2 hunks, 4 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@
 +1
 +2
 +3
  4
  5
  6
  7
  8
  9
 record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@
  4
  5
  6
  7
  8
  9
 -10.new
 record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end
 % record beginning, middle
 diff --git a/plain b/plain
 3 hunks, 7 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@
 +1
 +2
 +3
  4
  5
 record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@
  4
  5
 +5.new
 +5.reallynew
  6
  7
  8
  9
 record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@
  6
  7
  8
  9
 +10
 +11
 record change 3/3 to 'plain'? [Ynsfdaq?] 
-changeset:   15:c1c639d8b268
+changeset:   15:7d137997f3a6
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:14 1970 +0000
 summary:     middle-only
 
-diff -r efc0dad7bd9f -r c1c639d8b268 plain
+diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain
 --- a/plain	Thu Jan 01 00:00:13 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
 @@ -1,5 +1,10 @@
 +1
 +2
 +3
  4
  5
 +5.new
 +5.reallynew
  6
  7
  8
 
 % record end
 diff --git a/plain b/plain
 1 hunks, 2 lines changed
 examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@
  7
  8
  9
 +10
 +11
 record this change to 'plain'? [Ynsfdaq?] 
-changeset:   16:80b74bbc7808
+changeset:   16:4959e3ff13eb
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:15 1970 +0000
 summary:     end-only
 
-diff -r c1c639d8b268 -r 80b74bbc7808 plain
+diff -r 7d137997f3a6 -r 4959e3ff13eb plain
 --- a/plain	Thu Jan 01 00:00:14 1970 +0000
 +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
 @@ -9,3 +9,5 @@
  7
  8
  9
 +10
 +11
 
 adding subdir/a
 diff --git a/subdir/a b/subdir/a
 1 hunks, 1 lines changed
 examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@
  a
 +a
 record this change to 'subdir/a'? [Ynsfdaq?] 
-changeset:   18:33ff5c4fb017
+changeset:   18:40698cd490b2
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:16 1970 +0000
 summary:     subdir-change
 
-diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a
+diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a
 --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
 @@ -1,1 +1,2 @@
  a
 +a
 
 % help, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change
 n - skip this change
 s - skip remaining changes to this file
 f - record remaining changes to this file
 d - done, skip remaining changes and files
 a - record all changes to all remaining files
 q - quit, recording no changes
 ? - display help
 examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit
 % skip
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
 % no
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
 % f, quit
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit
 % s, all
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2
 1 hunks, 1 lines changed
 examine changes to 'subdir/f2'? [Ynsfdaq?] 
-changeset:   20:094183e04b7c
+changeset:   20:d2d8c25276a8
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:18 1970 +0000
 summary:     x
 
-diff -r f9e855cd9374 -r 094183e04b7c subdir/f2
+diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2
 --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
 +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
 @@ -1,1 +1,2 @@
  b
 +b
 
 % f
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   21:38164785b0ef
+changeset:   21:1013f51ce32f
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:19 1970 +0000
 summary:     y
 
-diff -r 094183e04b7c -r 38164785b0ef subdir/f1
+diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1
 --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
 +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
 @@ -1,1 +1,2 @@
  a
 +a
 
 % preserve chmod +x
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100644
 new mode 100755
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@
  a
  a
 +a
 record this change to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   22:a891589cb933
+changeset:   22:5df857735621
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:20 1970 +0000
 summary:     z
 
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100644
 new mode 100755
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -1,2 +1,3 @@
  a
  a
 +a
 
 % preserve execute permission on original
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@
  a
  a
  a
 +b
 record this change to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   23:befa0dae6201
+changeset:   23:a4ae36a78715
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:21 1970 +0000
 summary:     aa
 
 diff --git a/subdir/f1 b/subdir/f1
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -1,3 +1,4 @@
  a
  a
  a
 +b
 
 % preserve chmod -x
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100755
 new mode 100644
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@
  a
  a
  b
 +c
 record this change to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   24:8fd83ff53ce6
+changeset:   24:1460f6e47966
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:22 1970 +0000
 summary:     ab
 
 diff --git a/subdir/f1 b/subdir/f1
 old mode 100755
 new mode 100644
 --- a/subdir/f1
 +++ b/subdir/f1
 @@ -2,3 +2,4 @@
  a
  a
  b
 +c
 
 % with win32ext
 diff --git a/subdir/f1 b/subdir/f1
 1 hunks, 1 lines changed
 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@
  a
  b
  c
 +d
 record this change to 'subdir/f1'? [Ynsfdaq?] 
-changeset:   25:49b3838dc9e7
+changeset:   25:5bacc1f6e9cf
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:23 1970 +0000
 summary:     w1
 
-diff -r 8fd83ff53ce6 -r 49b3838dc9e7 subdir/f1
+diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1
 --- a/subdir/f1	Thu Jan 01 00:00:22 1970 +0000
 +++ b/subdir/f1	Thu Jan 01 00:00:23 1970 +0000
 @@ -3,3 +3,4 @@
  a
  b
  c
 +d
 

tests/test-rename-dir-merge.out

@@ -1,82 +1,82 b''
 adding a/a
 adding a/b
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 moving a/a to b/a
 moving a/b to b/b
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
   searching for copies back to rev 1
   unmatched files in local:
    a/c
    a/d
   unmatched files in other:
    b/a
    b/b
   all copies found (* = to merge, ! = divergent):
    b/a -> a/a 
    b/b -> a/b 
   checking for directory renames
   dir a/ -> b/
   file a/c -> b/c
   file a/d -> b/d
 resolving manifests
  overwrite None partial False
- ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
+ ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
  a/d: remote renamed directory to b/d -> d
  a/c: remote renamed directory to b/c -> d
  a/b: other deleted -> r
  a/a: other deleted -> r
  b/a: remote created -> g
  b/b: remote created -> g
 update: a/a 1/6 files (16.67%)
 removing a/a
 update: a/b 2/6 files (33.33%)
 removing a/b
 update: a/c 3/6 files (50.00%)
 moving a/c to b/c
 update: a/d 4/6 files (66.67%)
 moving a/d to b/d
 update: b/a 5/6 files (83.33%)
 getting b/a
 update: b/b 6/6 files (100.00%)
 getting b/b
 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 a/* b/a b/b b/c b/d
 M b/a
 M b/b
 A b/c
   a/c
 R a/a
 R a/b
 R a/c
 ? b/d
 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in local:
    b/a
    b/b
    b/d
   unmatched files in other:
    a/c
   all copies found (* = to merge, ! = divergent):
    b/a -> a/a 
    b/b -> a/b 
   checking for directory renames
   dir a/ -> b/
   file a/c -> b/c
 resolving manifests
  overwrite None partial False
- ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
+ ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
  None: local renamed directory to b/c -> d
 update:None 1/1 files (100.00%)
 getting a/c to b/c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 a/* b/a b/b b/c b/d
 A b/c
   a/c
 ? b/d
 created new head
 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88

tests/test-rename-merge1.out

@@ -1,46 +1,46 b''
 checkout
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 merge
   searching for copies back to rev 1
   unmatched files in local:
    c2
   unmatched files in other:
    b
    b2
   all copies found (* = to merge, ! = divergent):
    c2 -> a2 !
    b -> a *
    b2 -> a2 !
   checking for directory renames
  a2: divergent renames -> dr
 resolving manifests
  overwrite None partial False
- ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
+ ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c
  a: remote moved to b -> m
  b2: remote created -> g
 preserving a for resolve of b
 removing a
 update: a 1/3 files (33.33%)
 picked tool 'internal:merge' for b (binary False symlink False)
 merging a and b to b
-my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
+my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
  premerge successful
 update: a2 2/3 files (66.67%)
 warning: detected divergent renames of a2 to:
  c2
  b2
 update: b2 3/3 files (100.00%)
 getting b2
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M b
   a
 M b2
 R a
 C c2
 blahblah
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      67      0       1 dc51707dfc98 000000000000 000000000000
-     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
+     0         0      67      0       1 57eacc201a7f 000000000000 000000000000
+     1        67      72      1       3 4727ba907962 000000000000 57eacc201a7f
 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

tests/test-rename-merge2.out

@@ -1,651 +1,651 b''
 created new head
 --------------
 test L:up a   R:nc a b W:       - 1  get local a to b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
+ ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24
  rev: versions differ -> m
  a: remote copied to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
 update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
-my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
+my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
  premerge successful
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 C a
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a   W:       - 2  get rem change to a and b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
+ ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71
  a: remote is newer -> g
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 getting a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
-my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
   a
 --------------
 
 created new head
 --------------
 test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
+ ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
 update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
-my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
+my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
  premerge successful
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a   W:       - 4  get remote change to b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
+ ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
-my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 created new head
 --------------
 test L:       R:nc a b W:       - 5  get b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 getting b
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 created new head
 --------------
 test L:nc a b R:       W:       - 6  nothing
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
 update: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 C a
 C b
 --------------
 
 created new head
 --------------
 test L:       R:nm a b W:       - 7  get b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a
  a: other deleted -> r
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 removing a
 update: b 2/3 files (66.67%)
 getting b
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 created new head
 --------------
 test L:nm a b R:       W:       - 8  nothing
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
+ ancestor 924404dff337 local 02963e448370+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
 update: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 C b
 --------------
 
 created new head
 --------------
 test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
+ ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
+my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
+my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 created new head
 --------------
 test L:nm a b R:nm a c W:       - 11 get c, keep b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   unmatched files in other:
    c
   all copies found (* = to merge, ! = divergent):
    c -> a !
    b -> a !
   checking for directory renames
  a: divergent renames -> dr
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
+ ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e
  rev: versions differ -> m
  c: remote created -> g
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 warning: detected divergent renames of a to:
  b
  c
 update: c 2/3 files (66.67%)
 getting c
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M c
 C b
 --------------
 
 created new head
 --------------
 test L:nc a b R:up b   W:       - 12 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
+ ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
+my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 created new head
 --------------
 test L:up b   R:nm a b W:       - 13 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
+ ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 removing a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a b W:       - 14 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 getting a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 created new head
 --------------
 test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
+ ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 removing a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 getting a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 created new head
 --------------
 test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
+ ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
+my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a b W:       - 18 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
+ ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a
  b: versions differ -> m
  rev: versions differ -> m
 remote changed a which local deleted
 use (c)hanged version or leave (d)eleted? c
  a: prompt recreating -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 getting a
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
+my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 created new head
 --------------
 test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
+ ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a
  local changed a which remote deleted
 use (c)hanged version or (d)elete? c
  a: prompt keep -> a
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: a 1/3 files (33.33%)
 update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
-my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
+my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 created new head
 --------------
 test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
+ ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
 update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
-my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
+my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 created new head
 --------------
 test L:um a b R:up a   W:       - 21 merge a and b to b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
+ ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
-my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
 update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a c W:       - 23 get c, keep b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   unmatched files in other:
    c
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
+ ancestor 924404dff337 local 02963e448370+ remote 2b958612230f
  b: local copied/moved to a -> m
  rev: versions differ -> m
  c: remote created -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
 update: b 1/3 files (33.33%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
-my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
+my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
  premerge successful
 update: c 2/3 files (66.67%)
 getting c
 update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
-my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
+my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 M c
 --------------
 

tests/test-ssh-clone-r.out

@@ -1,192 +1,192 b''
 # creating 'remote'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       3      0       0 362fef284ce2 000000000000 000000000000
      1         3       5      1       1 125144f7e028 362fef284ce2 000000000000
      2         8       7      2       2 4c982badb186 125144f7e028 000000000000
      3        15       9      3       3 19b1fc555737 4c982badb186 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       7 905359268f77 000000000000 000000000000
+     0         0      75      0       7 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
-     0         0      75      0       8 905359268f77 000000000000 000000000000
+     0         0      75      0       8 2565f3199a74 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       8      0       6 12ab3bcc5ea4 000000000000 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      48      0       0 43eadb1d2d06 000000000000 000000000000
      1        48      48      1       1 8b89697eba2c 43eadb1d2d06 000000000000
      2        96      48      2       2 626a32663c2f 8b89697eba2c 000000000000
      3       144      48      3       3 f54c32f13478 626a32663c2f 000000000000
      4       192      58      3       6 de68e904d169 626a32663c2f 000000000000
-     5       250      68      3       7 3b45cc2ab868 de68e904d169 000000000000
-     6       318      54      6       8 24d86153a002 f54c32f13478 000000000000
+     5       250      68      3       7 09bb521d218d de68e904d169 000000000000
+     6       318      54      6       8 1fde233dfb0f f54c32f13478 000000000000
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 # clone remote via stream
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 4 changesets, 4 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 1 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 3 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 2 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 4 changesets, 5 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 6 changes to 3 files
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 5 changesets, 6 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 5 changesets, 5 total revisions
 pulling from ../test-7
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 2 changes to 3 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions
 pulling from ssh://user@dummy/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 3 changesets, 2 total revisions
 pulling from ssh://user@dummy/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 6 changesets with 5 changes to 4 files
 (run 'hg update' to get a working copy)
 pulling from ssh://user@dummy/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 0 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 5 changesets, 3 total revisions
 pulling from ssh://user@dummy/remote
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 4 files, 9 changesets, 7 total revisions

tests/test-win32text.out

@@ -1,304 +1,304 b''
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
 commit should succeed
 
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 commit should fail
 Attempt to commit or push text file(s) using CRLF line endings
 in f583ea08d42a: f
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 
 commits should succeed
 
 push should fail
 pushing to ../zoz
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 Attempt to commit or push text file(s) using CRLF line endings
-in b94ebd309a6d: g
+in bc2d09796734: g
 in b1aa5cde7ff4: f
 
 To prevent this mistake in your local repository,
 add to Mercurial.ini or .hg/hgrc:
 
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 
 and also consider adding:
 
 [extensions]
 win32text =
 [encode]
 ** = cleverencode:
 [decode]
 ** = cleverdecode:
 transaction abort!
 rollback completed
 abort: pretxnchangegroup.crlf hook failed
 
 commit should succeed
 
 push should succeed
 pushing to ../zoz
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 2 files
 
 and now for something completely different
 Attempt to commit or push text file(s) using CRLF line endings
-in cefdb8d0b741: d/f2
+in 053ba1a3035a: d/f2
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 forgetting d/f2
 
 
-changeset:   5:d4ea9ae21be3
+changeset:   5:f0b1c8d75fce
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
-changeset:   4:6ba409927d51
+changeset:   4:77796dbcd4ad
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
-changeset:   3:788a4e595187
+changeset:   3:7c1b5430b350
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
-changeset:   2:b94ebd309a6d
+changeset:   2:bc2d09796734
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 adding dupe/a
 adding dupe/b
 adding dupe/c
 adding dupe/d
-changeset:   8:7654104f33c3
+changeset:   8:67ac5962ab43
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       d
 description:
 d
 
 
-changeset:   7:9be4c2808cc9
+changeset:   7:68c127d1834e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       b c
 description:
 b/c
 
 
-changeset:   6:aa4367ed325a
+changeset:   6:adbf8bf7f31d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       a
 description:
 a
 
 
-changeset:   5:d4ea9ae21be3
+changeset:   5:f0b1c8d75fce
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
-changeset:   4:6ba409927d51
+changeset:   4:77796dbcd4ad
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
-changeset:   3:788a4e595187
+changeset:   3:7c1b5430b350
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
-changeset:   2:b94ebd309a6d
+changeset:   2:bc2d09796734
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 pulling from dupe
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 4 changes to 4 files
 Attempt to commit or push text file(s) using CRLF line endings
-in 7654104f33c3: d
-in 9be4c2808cc9: b
-in 9be4c2808cc9: c
+in 67ac5962ab43: d
+in 68c127d1834e: b
+in 68c127d1834e: c
 
 To prevent this mistake in your local repository,
 add to Mercurial.ini or .hg/hgrc:
 
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 
 and also consider adding:
 
 [extensions]
 win32text =
 [encode]
 ** = cleverencode:
 [decode]
 ** = cleverdecode:
 transaction abort!
 rollback completed
 abort: pretxnchangegroup.crlf hook failed
 
-changeset:   5:d4ea9ae21be3
+changeset:   5:f0b1c8d75fce
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
-changeset:   4:6ba409927d51
+changeset:   4:77796dbcd4ad
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
-changeset:   3:788a4e595187
+changeset:   3:7c1b5430b350
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
-changeset:   2:b94ebd309a6d
+changeset:   2:bc2d09796734
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 hello<NUL><CR><LF>
 some<LF>text<LF>
 rem empty<CR><LF>
 
 [extensions]
 win32text = 
 [decode]
 ** = cleverdecode:
 [encode]
 ** = cleverencode:
 
 WARNING: f4.bat already has CRLF line endings
 and does not need EOL conversion by the win32text plugin.
 Before your next commit, please reconsider your encode/decode settings in 
 Mercurial.ini or ..../.hg/hgrc.
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 hello<NUL><CR><LF>
 some<CR><LF>text<CR><LF>
 rem empty<CR><LF>
 
 # empty<CR><LF>
 # empty<LF>
 % just linefeed<LF>
 % just linefeed<LF>
 no changes needed to linefeed
 % just linefeed<LF>
 M linefeed
 reverting linefeed
 % just linefeed<CR><LF>