diff --git a/eden/scm/tests/test-absorb-rename.t b/eden/scm/tests/test-absorb-rename.t
index 43bfe05fad..93641fd793 100644
--- a/eden/scm/tests/test-absorb-rename.t
+++ b/eden/scm/tests/test-absorb-rename.t
@@ -1,7 +1,6 @@
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ enable absorb
   $ setconfig diff.git=1
 
@@ -39,13 +38,13 @@ rename a to b, then b to a
   $ hg status
 
   $ hg annotate -ncf a
-  0 5d1c5620e6f2 a: 1a
-  1 9a14ffe67ae9 b: 2a
-  2 9191d121a268 a: 3a
+  3 5d1c5620e6f2 a: 1a
+  4 9a14ffe67ae9 b: 2a
+  5 9191d121a268 a: 3a
 
 when the first changeset is public
 
-  $ hg phase --public -r 0
+  $ hg phase --public -r 3
 
   $ sedi 's/a/A/' a
 
@@ -146,7 +145,7 @@ copy b to a
   $ hg absorb -aq
 
   $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
-  @  1:70606019f91b cp
+  @  3:70606019f91b cp
   |  diff --git a/b b/a
   |  rename from b
   |  rename to a
@@ -165,7 +164,7 @@ copy b to a
   |  +1
   |  +3c
   |
-  o  0:bfb67c3539c1 1
+  o  2:bfb67c3539c1 1
      diff --git a/b b/b
      new file mode 100644
      --- /dev/null
@@ -178,7 +177,7 @@ run absorb again would apply the change to c
   $ hg absorb -aq
 
   $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
-  @  1:8bd536cce368 cp
+  @  4:8bd536cce368 cp
   |  diff --git a/b b/a
   |  rename from b
   |  rename to a
@@ -197,7 +196,7 @@ run absorb again would apply the change to c
   |  +1c
   |  +3c
   |
-  o  0:bfb67c3539c1 1
+  o  2:bfb67c3539c1 1
      diff --git a/b b/b
      new file mode 100644
      --- /dev/null
@@ -245,7 +244,7 @@ run absorb again would apply the change to c
    2e
 
   $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
-  @  2:34be9b0c786e mv
+  @  5:34be9b0c786e mv
   |  diff --git a/c b/c
   |  deleted file mode 100644
   |  --- a/c
@@ -257,7 +256,7 @@ run absorb again would apply the change to c
   |  rename from a
   |  rename to e
   |
-  o  1:13e56db5948d cp
+  o  4:13e56db5948d cp
   |  diff --git a/b b/a
   |  rename from b
   |  rename to a
@@ -285,7 +284,7 @@ run absorb again would apply the change to c
   |   1d
   |  +4d
   |
-  o  0:0037613a5dc6 1
+  o  3:0037613a5dc6 1
      diff --git a/b b/b
      new file mode 100644
      --- /dev/null
diff --git a/eden/scm/tests/test-bookmarks-rebase.t b/eden/scm/tests/test-bookmarks-rebase.t
index 5ee5ae08f3..fa29a5a764 100644
--- a/eden/scm/tests/test-bookmarks-rebase.t
+++ b/eden/scm/tests/test-bookmarks-rebase.t
@@ -1,7 +1,6 @@
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ enable rebase
 
 initialize repository
@@ -42,7 +41,7 @@ rebase
   rebasing 2ae46b1d99a7 "3" (two)
 
   $ hg log
-  changeset:   3:42e5ed2cdcf4
+  changeset:   4:42e5ed2cdcf4
   bookmark:    two
   parent:      1:925d80f479bb
   user:        test
@@ -85,8 +84,8 @@ aborted rebase should restore active bookmark.
   rebase aborted
   $ hg bookmark
      one                       1:925d80f479bb
-   * three                     4:dd7c838e8362
-     two                       3:42e5ed2cdcf4
+   * three                     5:dd7c838e8362
+     two                       4:42e5ed2cdcf4
 
 after aborted rebase, restoring a bookmark that has been removed should not fail
 
@@ -101,4 +100,4 @@ after aborted rebase, restoring a bookmark that has been removed should not fail
   rebase aborted
   $ hg bookmark
      one                       1:925d80f479bb
-     two                       3:42e5ed2cdcf4
+     two                       4:42e5ed2cdcf4
diff --git a/eden/scm/tests/test-debugstrip.t b/eden/scm/tests/test-debugstrip.t
index fd87fbe5bc..ccb8d9a7da 100644
--- a/eden/scm/tests/test-debugstrip.t
+++ b/eden/scm/tests/test-debugstrip.t
@@ -1,7 +1,6 @@
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ disable treemanifest
 
   $ setconfig format.usegeneraldelta=yes
@@ -858,22 +857,21 @@ Test high-level scmutil.cleanupnodes API
   >                 scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace')
   > EOF
   $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
-  warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
 
   $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
-  o  8:1473d4b996d1 G2 G G2 b-F@divergent3 b-G
+  o  12:1473d4b996d1 G2 G G2 b-F@divergent3 b-G
   |
-  | o  7:d11b3456a873 F2 F F2 b-F
+  | o  11:d11b3456a873 F2 F F2 b-F
   | |
-  | o  5:5cb05ba470a7 H H
+  | o  8:5cb05ba470a7 H H
   |/|
-  | o  3:7fb047a69f22 E E b-F@divergent1
+  | o  4:7fb047a69f22 E E b-F@divergent1
   | |
-  | | o  6:7c78f703e465 D2 D D2 b-D
+  | | o  10:7c78f703e465 D2 D D2 b-D
   | | |
-  | | o  4:26805aba1e60 C
+  | | o  6:26805aba1e60 C
   | | |
-  | | o  2:112478962961 B
+  | | o  3:112478962961 B
   | |/
   o |  1:1fc8102cda62 G
    /
@@ -883,23 +881,23 @@ Test high-level scmutil.cleanupnodes API
      A                         0:426bada5c675
      B                         0:426bada5c675
      C                         0:426bada5c675
-     D                         6:7c78f703e465
-     D2                        6:7c78f703e465
-     E                         3:7fb047a69f22
-     F                         7:d11b3456a873
-     F2                        7:d11b3456a873
-     G                         8:1473d4b996d1
-     G2                        8:1473d4b996d1
-     H                         5:5cb05ba470a7
+     D                         10:7c78f703e465
+     D2                        10:7c78f703e465
+     E                         4:7fb047a69f22
+     F                         11:d11b3456a873
+     F2                        11:d11b3456a873
+     G                         12:1473d4b996d1
+     G2                        12:1473d4b996d1
+     H                         8:5cb05ba470a7
      I                         0:426bada5c675
      Z                         -1:000000000000
      b-B                       0:426bada5c675
      b-C                       0:426bada5c675
-     b-D                       6:7c78f703e465
-     b-F                       7:d11b3456a873
-     b-F@divergent1            3:7fb047a69f22
-     b-F@divergent3            8:1473d4b996d1
-     b-G                       8:1473d4b996d1
+     b-D                       10:7c78f703e465
+     b-F                       11:d11b3456a873
+     b-F@divergent1            4:7fb047a69f22
+     b-F@divergent3            12:1473d4b996d1
+     b-G                       12:1473d4b996d1
      b-I                       0:426bada5c675
      b-Z                       -1:000000000000
 
@@ -926,11 +924,11 @@ we have reusable code here
   | |
   | | o  10:7c78f703e465 D2 D D2 b-D
   | | |
-  | | x  6:26805aba1e60 C
+  | | o  6:26805aba1e60 C
   | | |
-  | | x  3:112478962961 B
+  | | o  3:112478962961 B
   | |/
-  x |  1:1fc8102cda62 G
+  o |  1:1fc8102cda62 G
    /
   o  0:426bada5c675 A A B C I b-B b-C b-I
   
diff --git a/eden/scm/tests/test-fb-hgext-crdump.t b/eden/scm/tests/test-fb-hgext-crdump.t
index 76d39ac2cf..24664194e6 100644
--- a/eden/scm/tests/test-fb-hgext-crdump.t
+++ b/eden/scm/tests/test-fb-hgext-crdump.t
@@ -1,6 +1,6 @@
 #chg-compatible
 
-  $ configure evolution dummyssh
+  $ configure mutation-norecord dummyssh
   $ enable amend crdump remotenames
   $ showgraph() {
   >   hg log --graph --hidden -T "{rev} {desc|firstline}" | sed \$d
@@ -75,23 +75,6 @@ Test obsolete markers
                   "bin2"
               ],
               "node": "9e6c8a14e241d3140575d17288d4a91bd8c9a3c8",
-              "obsolete": [
-                  {
-                      "date": [
-                          0.0,
-                          0
-                      ],
-                      "flag": 0,
-                      "metadata": {
-                          "operation": "amend",
-                          "user": "test"
-                      },
-                      "prednode": "6370cd64643d547e11c6bc91920bca7b44ea21b5",
-                      "succnodes": [
-                          "9e6c8a14e241d3140575d17288d4a91bd8c9a3c8"
-                      ]
-                  }
-              ],
               "p1": {
                   "node": "65d913976cc18347138f7b9f5186010d39b39b0f"
               },
diff --git a/eden/scm/tests/test-fb-hgext-fbhistedit-exec.t b/eden/scm/tests/test-fb-hgext-fbhistedit-exec.t
index 742c1fb5b1..12a72f791a 100644
--- a/eden/scm/tests/test-fb-hgext-fbhistedit-exec.t
+++ b/eden/scm/tests/test-fb-hgext-fbhistedit-exec.t
@@ -1,7 +1,6 @@
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ . "$TESTDIR/histedit-helpers.sh"
 
   $ enable fbhistedit histedit rebase
@@ -300,17 +299,18 @@ Multiple exec commands must work
   o  cb9a9f314b8b a
   
 
-abort on a failing command, e.g when we have children
+abort on a failing command, e.g an unknown commit
 
   $ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle
   > pick 177f92b77385 c
   > pick 055a42cdd887 d
   > pick e860deea161a e
-  > exec echo "added" > added && hg add added && hg commit --amend
+  > exec echo "added" > added && hg foo -q
   > pick 652413bf663e f
   > EOF
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  abort: cannot amend changeset with children
+  unknown command 'foo'
+  (use 'hg help' to get help)
 
   $ hg histedit --abort
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -381,9 +381,9 @@ Test continue a stopped histedit
   |
   | o  652413bf663e f
   | |
-  | o  e860deea161a e
+  | x  e860deea161a e
   | |
-  | o  055a42cdd887 d
+  | x  055a42cdd887 d
   |/
   o  177f92b77385 c
   |
@@ -401,9 +401,9 @@ Test continue a stopped histedit
   |
   | o  652413bf663e f
   | |
-  | o  e860deea161a e
+  | x  e860deea161a e
   | |
-  | o  055a42cdd887 d
+  | x  055a42cdd887 d
   |/
   o  177f92b77385 c
   |
diff --git a/eden/scm/tests/test-fb-hgext-fbhistedit-graft.t b/eden/scm/tests/test-fb-hgext-fbhistedit-graft.t
index 670280fa63..18f3705f47 100644
--- a/eden/scm/tests/test-fb-hgext-fbhistedit-graft.t
+++ b/eden/scm/tests/test-fb-hgext-fbhistedit-graft.t
@@ -1,7 +1,6 @@
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ . "$TESTDIR/histedit-helpers.sh"
 
   $ enable fbhistedit histedit rebase
@@ -48,15 +47,15 @@ Use histedit to graft an extra commit into current history
   > EOF
 
   $ tglogp
-  @  7: fc9a25c1b8af draft 'c'
+  @  8: fc9a25c1b8af draft 'c'
   |
-  o  6: efc3ff9af0d1 draft 'e'
+  o  7: efc3ff9af0d1 draft 'e'
   |
-  | o  5: 1eb7eda15cd7 draft 'f'
+  | o  6: 1eb7eda15cd7 draft 'f'
   | |
-  | o  4: 581a2eefdc84 draft 'e'
+  | x  5: 581a2eefdc84 draft 'e'
   | |
-  | o  3: 331acda6ee00 draft 'd'
+  | o  4: 331acda6ee00 draft 'd'
   | |
   o |  2: c87fe1ae405f draft 'b'
   | |
diff --git a/eden/scm/tests/test-fb-hgext-lfs-pushrebase.t b/eden/scm/tests/test-fb-hgext-lfs-pushrebase.t
index e80f193f0a..501ecadc6a 100644
--- a/eden/scm/tests/test-fb-hgext-lfs-pushrebase.t
+++ b/eden/scm/tests/test-fb-hgext-lfs-pushrebase.t
@@ -1,8 +1,7 @@
 #chg-compatible
 
   $ disable treemanifest
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
 
   $ . "$TESTDIR/library.sh"
 
@@ -171,6 +170,7 @@ TODO: configure mutation
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 2 files
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 
 # This should work even if the HG server does not have access to LFS server
diff --git a/eden/scm/tests/test-fb-hgext-merge-conflictinfo.t b/eden/scm/tests/test-fb-hgext-merge-conflictinfo.t
index 123afc06ef..9bea18e151 100644
--- a/eden/scm/tests/test-fb-hgext-merge-conflictinfo.t
+++ b/eden/scm/tests/test-fb-hgext-merge-conflictinfo.t
@@ -1,8 +1,7 @@
 #require py2
 #chg-compatible
 
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
   $ enable conflictinfo rebase
 
 1) Make the repo
@@ -340,7 +339,7 @@ Test case 3: Source changed, dest moved
   $ hg rebase -d 2 -s 1
   rebasing ec87889f5f90 "source"
   merging file_newloc and file to file_newloc
-  $ hg up -q 2 # source
+  $ hg up -q 'desc(source)' # source
   $ cat file_newloc # Should follow:
   change
   $ hg resolve --tool=internal:dumpjson --all
@@ -415,7 +414,7 @@ Test case 5: Source moved, dest changed
   $ hg rebase -d 2 -s 1
   rebasing e6e7483a8950 "source"
   merging file and file_newloc to file_newloc
-  $ hg up 2
+  $ hg up 'desc(source)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat file_newloc
   change
diff --git a/eden/scm/tests/test-fb-hgext-pull-createmarkers.t b/eden/scm/tests/test-fb-hgext-pull-createmarkers.t
index 0b09717211..adb0c4d851 100644
--- a/eden/scm/tests/test-fb-hgext-pull-createmarkers.t
+++ b/eden/scm/tests/test-fb-hgext-pull-createmarkers.t
@@ -4,7 +4,7 @@
 
 Setup
 
-  $ configure evolution dummyssh
+  $ configure mutation-norecord dummyssh
   $ enable amend pullcreatemarkers pushrebase rebase remotenames
   $ setconfig ui.username="nobody <no.reply@fb.com>" experimental.rebaseskipobsolete=true
   $ setconfig remotenames.allownonfastforward=true
@@ -96,15 +96,6 @@ the remote
   $ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
   o  5 "add b"
   |
-  | o  4 "add e
-  | |
-  | |  Differential Revision: https://phabricator.fb.com/D131"
-  | o  3 "add d
-  | |
-  | |  Differential Revision: https://phabricator.intern.facebook.com/D124"
-  | o  2 "add c
-  |/
-  |    Differential Revision: https://phabricator.fb.com/D123"
   @  1 "add secondcommit"
   |
   o  0 "add initial"
diff --git a/eden/scm/tests/test-fb-hgext-pushrebase-set-dates.t b/eden/scm/tests/test-fb-hgext-pushrebase-set-dates.t
index 7e9dbf967c..aa5d9c841a 100644
--- a/eden/scm/tests/test-fb-hgext-pushrebase-set-dates.t
+++ b/eden/scm/tests/test-fb-hgext-pushrebase-set-dates.t
@@ -5,7 +5,7 @@
 
 #testcases nostackpush stackpush
   $ disable treemanifest
-  $ configure noevolution dummyssh
+  $ configure mutation-norecord dummyssh
 
   $ . "$TESTDIR/library.sh"
   $ getmysqldb
@@ -91,13 +91,12 @@ Make a push from the client
   remote: pushing 1 changeset:
   remote:     772868146114  client push
   remote: 2 new changesets from the server will be downloaded
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ log
-  o  client push [draft:a8078509f8d1]
+  @  client push [public:a8078509f8d1]
   |
-  o  server commit [draft:bb4844f92c89]
+  o  server commit [public:bb4844f92c89]
   |
-  | @  client push [draft:772868146114]
-  |/
   o  initial [public:2bb9d20e471c]
   
 Apply a bundle on the second server via the command line
@@ -167,12 +166,10 @@ Push a stack
   |
   o  stack push 1 [draft:c661726b7d93]
   |
-  o  client push [draft:a8078509f8d1]
+  o  client push [public:a8078509f8d1]
   |
-  o  server commit [draft:bb4844f92c89]
+  o  server commit [public:bb4844f92c89]
   |
-  | o  client push [draft:772868146114]
-  |/
   o  initial [public:2bb9d20e471c]
   
   $ hg log -r '.^::.' -T '{node}\n'
diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase.t b/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase.t
index 42feb02d7d..ba85d2292b 100644
--- a/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase.t
+++ b/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase.t
@@ -1,6 +1,5 @@
   $ setconfig treemanifest.flatcompat=False
-TODO: configure mutation
-  $ configure noevolution
+  $ configure mutation-norecord
 
   $ . "$TESTDIR/library.sh"
 
@@ -105,8 +104,6 @@ Test that pushrebase hooks can access the commit data
   $ cd ..
 
   $ hg clone -q ssh://user@dummy/master hook_client
-  fetching tree '' *, based on b25ede39b5168327f0596fcf74d1ff53842bad2a, found via * (glob)
-  1 trees fetched over * (glob)
   $ cd hook_client
   $ hg up -q master
   $ echo baz >> subdir/a
@@ -133,7 +130,5 @@ Push an empty commit with no trees
   $ hg push --to master --rev . --config treemanifest.sendtrees=True
   pushing to ssh://user@dummy/master
   searching for changes
-  fetching tree '' *, based on *, found via * (glob)
-  1 trees fetched over * (glob)
   remote: pushing 1 changeset:
   remote:     *  Empty commit (glob)
diff --git a/eden/scm/tests/test-uncommit.t b/eden/scm/tests/test-uncommit.t
index 2e505517b4..87e25ebe51 100644
--- a/eden/scm/tests/test-uncommit.t
+++ b/eden/scm/tests/test-uncommit.t
@@ -2,7 +2,7 @@
 
 Test uncommit - set up the config
 
-  $ configure evolution
+  $ configure mutation-norecord
 
 Build up a repo
 
@@ -269,9 +269,9 @@ Partial uncommit in the middle, does not move bookmark
   | | |/
   | | o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   | | |
-  | | x  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
+  | | o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   | |/
-  | x  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
+  | o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |/
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a