old mode 100755
new mode 100644
copy from tests/test-rebase-newancestor
copy to tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor
+++ b/tests/test-rebase-newancestor.t
@@ -1,33 +1,54 @@
-#!/bin/sh
-
-. $TESTDIR/helpers.sh
+  $ cat >> $HGRCPATH <<EOF
+  > [extensions]
+  > graphlog=
+  > rebase=
+  > 
+  > [alias]
+  > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
+  > EOF
 
-echo "[extensions]" >> $HGRCPATH
-echo "graphlog=" >> $HGRCPATH
-echo "rebase=" >> $HGRCPATH
+  $ hg init repo
+  $ cd repo
 
-rm -rf repo
-hg init repo
-cd repo
+  $ echo A > a
+  $ echo >> a
+  $ hg ci -Am A
+  adding a
 
-echo A > a
-echo >> a
-hg commit -AmA -u test -d '0 0'
+  $ echo B > a
+  $ echo >> a
+  $ hg ci -m B
+
+  $ echo C > a
+  $ echo >> a
+  $ hg ci -m C
+
+  $ hg up -q -C 0
 
-echo B > a
-echo >> a
-hg commit -mB -u test -d '1 0'
-
-echo C > a
-echo >> a
-hg commit -mC -u test -d '2 0'
+  $ echo D >> a
+  $ hg ci -Am AD
+  created new head
 
-hg up -C 0
-echo D >> a
-hg commit -AmAD -u test -d '3 0'
+  $ hg tglog
+  @  3: 'AD'
+  |
+  | o  2: 'C'
+  | |
+  | o  1: 'B'
+  |/
+  o  0: 'A'
+  
+  $ hg rebase -s 1 -d 3
+  merging a
+  merging a
+  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
 
-hg glog --template '{rev}:{desc} {node|short}\n'
-hg rebase -q -s 1 -d 3 | hidebackup
-hg glog --template '{rev}:{desc} {node|short}\n'
-
-exit 0
+  $ hg tglog
+  @  3: 'C'
+  |
+  o  2: 'B'
+  |
+  o  1: 'AD'
+  |
+  o  0: 'A'
+