diff --git a/tests/test-narrow-widen.t b/tests/test-narrow-widen-non-ellipsis.t
copy from tests/test-narrow-widen.t
copy to tests/test-narrow-widen-non-ellipsis.t
--- a/tests/test-narrow-widen.t
+++ b/tests/test-narrow-widen-non-ellipsis.t
@@ -1,19 +1,12 @@
-#testcases flat tree
   $ . "$TESTDIR/narrow-library.sh"
 
-#if tree
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > treemanifest = 1
   > EOF
-#endif
 
   $ hg init master
   $ cd master
-  $ cat >> .hg/hgrc <<EOF
-  > [narrow]
-  > serveellipses=True
-  > EOF
 
   $ mkdir inside
   $ echo 'inside' > inside/f
@@ -39,7 +32,7 @@
   adding changesets
   adding manifests
   adding file changes
-  added 2 changesets with 1 changes to 1 files
+  added 3 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -96,15 +89,9 @@
   comparing with ssh://user@dummy/master
   searching for changes
   no changes found
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1 changes to 1 files
-  new changesets *:* (glob)
+  3 local changesets published
   $ hg tracked
   I path:inside
-  I path:wider/f
 
 Pull down the newly added upstream revision.
 
@@ -114,27 +101,31 @@
   adding changesets
   adding manifests
   adding file changes
-  added 4 changesets with 2 changes to 2 files
+  added 5 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   (run 'hg update' to get a working copy)
   $ hg update -r 'desc("add wider")'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
-  wider
+  cat: wider/f: $ENOENT$
+  [1]
 
   $ hg update -r 'desc("update inside")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat wider/f
-  wider
+  cat: wider/f: $ENOENT$
+  [1]
   $ cat inside/f
   inside v2
 
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
-  ...*: update widest v4 (glob)
+  45662f0793c7: update widest v4
+  1dd1364b566e: add outside2
   *: update inside (glob)
-  ...*: update widest v3 (glob)
+  be0600e3ccba: update widest v3
   *: add wider, update widest (glob)
-  ...*: add outside (glob)
+  4922ea71b958: add outside
+  40e0ea6c8cd7: add widest
   *: add inside (glob)
 
 Check that widening with a newline fails
@@ -150,42 +141,42 @@
   comparing with ssh://user@dummy/master
   searching for changes
   no changes found
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 8 changesets with 7 changes to 3 files
-  new changesets *:* (glob)
+  5 local changesets published
+  abort: path ends in directory separator: widest/
+  [255]
   $ hg tracked
   I path:inside
-  I path:wider/f
-  I path:widest
   $ hg update 'desc("add widest")'
-  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ cat widest/f
-  widest
-  $ hg update 'desc("add wider, update widest")'
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cat wider/f
-  wider
-  $ cat widest/f
-  widest v2
-  $ hg update 'desc("update widest v3")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
-  widest v3
+  cat: widest/f: $ENOENT$
+  [1]
+  $ hg update 'desc("add wider, update widest")'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cat wider/f
+  cat: wider/f: $ENOENT$
+  [1]
+  $ cat widest/f
+  cat: widest/f: $ENOENT$
+  [1]
+  $ hg update 'desc("update widest v3")'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cat widest/f
+  cat: widest/f: $ENOENT$
+  [1]
   $ hg update 'desc("update widest v4")'
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat widest/f
-  widest v4
+  cat: widest/f: $ENOENT$
+  [1]
 
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   *: update widest v4 (glob)
-  ...*: add outside2 (glob)
+  1dd1364b566e: add outside2
   *: update inside (glob)
   *: update widest v3 (glob)
   *: add wider, update widest (glob)
-  ...*: add outside (glob)
+  4922ea71b958: add outside
   *: add widest (glob)
   *: add inside (glob)
 
@@ -195,10 +186,6 @@
   $ cd ..
   $ hg init upstream
   $ cd upstream
-  $ cat >> .hg/hgrc <<EOF
-  > [narrow]
-  > serveellipses=True
-  > EOF
   $ for x in `$TESTDIR/seq.py 0 10`
   > do
   >   mkdir d$x
@@ -227,7 +214,7 @@
   adding changesets
   adding manifests
   adding file changes
-  added 8 changesets with 4 changes to 4 files
+  added 11 changesets with 4 changes to 4 files
   new changesets *:* (glob)
   updating to branch default
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -240,43 +227,44 @@
   $ hg verify
   checking changesets
   checking manifests
-  checking directory manifests (tree !)
+  checking directory manifests
   crosschecking files in changesets and manifests
   checking files
-  4 files, 8 changesets, 4 total revisions
+  4 files, 11 changesets, 4 total revisions
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
-  ...*: add d10/f (glob)
+  5dcf948d1e26: add d10/f
   *: add d9/f (glob)
-  ...*: add d8/f (glob)
+  ed07d334af10: add d8/f
+  472749d2eed8: add d7/f
   *: add d6/f (glob)
-  ...*: add d5/f (glob)
+  47c482f555ec: add d5/f
+  3c6772db7d10: add d4/f
   *: add d3/f (glob)
-  ...*: add d2/f (glob)
+  a68ce05aaaed: add d2/f
+  5934322a52dd: add d1/f
   *: add d0/f (glob)
   $ hg tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   no changes found
-  saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 9 changesets with 5 changes to 5 files
-  new changesets *:* (glob)
+  11 local changesets published
+  abort: path ends in directory separator: d1/
+  [255]
   $ hg tracked
   I path:d0
-  I path:d1
   I path:d3
   I path:d6
   I path:d9
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
-  ...*: add d10/f (glob)
+  5dcf948d1e26: add d10/f
   *: add d9/f (glob)
-  ...*: add d8/f (glob)
+  ed07d334af10: add d8/f
+  472749d2eed8: add d7/f
   *: add d6/f (glob)
-  ...*: add d5/f (glob)
+  47c482f555ec: add d5/f
+  3c6772db7d10: add d4/f
   *: add d3/f (glob)
-  ...*: add d2/f (glob)
+  a68ce05aaaed: add d2/f
   *: add d1/f (glob)
   *: add d0/f (glob)
 
@@ -285,10 +273,10 @@
   $ hg verify
   checking changesets
   checking manifests
-  checking directory manifests (tree !)
+  checking directory manifests
   crosschecking files in changesets and manifests
   checking files
-  5 files, 9 changesets, 5 total revisions
+  4 files, 11 changesets, 4 total revisions
 
 Widening preserves parent of local commit
 
@@ -297,7 +285,8 @@
   $ cd narrow3
   $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
   *: add d2/f (glob)
-  ...*: add d1/f (glob)
+  5934322a52dd: add d1/f
+  44d97ac7c511: add d0/f
   $ hg pull -q -r 3
   $ hg co -q tip
   $ hg pull -q -r 4
@@ -305,6 +294,8 @@
   $ hg ci -m local
   created new head
   $ hg tracked -q --addinclude d0 --addinclude d9
+  abort: path ends in directory separator: d0/
+  [255]
 
 Widening preserves bookmarks
 
@@ -315,10 +306,12 @@
   $ hg ci -m local
   $ hg bookmarks bookmark
   $ hg bookmarks
-   * bookmark                  3:* (glob)
+   * bookmark                  11:42aed9c63197
   $ hg -q tracked --addinclude d2
+  abort: path ends in directory separator: d2/
+  [255]
   $ hg bookmarks
-   * bookmark                  5:* (glob)
+   * bookmark                  11:42aed9c63197
   $ hg log -r bookmark -T '{desc}\n'
   local
 
@@ -330,36 +323,56 @@
   $ echo local > d0/f
   $ hg ci -m local
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
-  2: local
-  ...1: add d10/f
+  11: local
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
   0: add d0/f
   $ hg bookmarks bookmark
   $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
   comparing with ssh://user@dummy/upstream
   searching for changes
   no changes found
-  saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 3 changesets with 2 changes to 2 files
-  transaction abort!
-  rollback completed
-  abort: pretxnchangegroup.bad hook exited with status 1
+  11 local changesets published
+  abort: path ends in directory separator: d1/
   [255]
   $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
-  $ hg bookmarks
-  no bookmarks set
-  $ hg unbundle .hg/strip-backup/*-widen.hg
-  adding changesets
-  adding manifests
-  adding file changes
-  added 3 changesets with 2 changes to 1 files
-  new changesets *:* (glob)
-  (run 'hg update' to get a working copy)
-  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
-  2: local
-  ...1: add d10/f
+  11: local
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
   0: add d0/f
   $ hg bookmarks
-   * bookmark                  2:* (glob)
+   * bookmark                  11:b7ce3df41eca
+  $ hg unbundle .hg/strip-backup/*-widen.hg
+  abort: $ENOENT$: .hg/strip-backup/*-widen.hg
+  [255]
+  $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
+  11: local
+  10: add d10/f
+  9: add d9/f
+  8: add d8/f
+  7: add d7/f
+  6: add d6/f
+  5: add d5/f
+  4: add d4/f
+  3: add d3/f
+  2: add d2/f
+  1: add d1/f
+  0: add d0/f
+  $ hg bookmarks
+   * bookmark                  11:b7ce3df41eca