tests: unify test-merge-symlinks

tests/test-merge-symlinks.t

@@ -1,22 +1,21 b''
-#!/bin/sh
 
-cat > echo.py <<EOF
-#!/usr/bin/env python
-import os, sys
-try:
-    import msvcrt
-    msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-    msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
-except ImportError:
-    pass
+  $ cat > echo.py <<EOF
+  > #!/usr/bin/env python
+  > import os, sys
+  > try:
+  >     import msvcrt
+  >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+  >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
+  > except ImportError:
+  >     pass
+  > 
+  > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
+  >     print k, os.environ[k]
+  > EOF
 
-for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
-    print k, os.environ[k]
-EOF
+Create 2 heads containing the same file, once as
+a file, once as a link. Bundle was generated with:
 
-# Create 2 heads containing the same file, once as
-# a file, once as a link. Bundle was generated with:
-#
 # hg init t
 # cd t
 # echo a > a
@@ -29,18 +28,35 b' EOF'
 # echo l2 > l2
 # hg ci -qAm t3 -d '3 0'
 
-hg init t
-cd t
-hg -q pull "$TESTDIR/test-merge-symlinks.hg"
-hg up -C 3
+  $ hg init t
+  $ cd t
+  $ hg -q pull "$TESTDIR/test-merge-symlinks.hg"
+  $ hg up -C 3
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+Merge them and display *_ISLINK vars
+merge heads
 
-# Merge them and display *_ISLINK vars
-echo % merge heads
-HGMERGE="python ../echo.py" hg merge
+  $ HGMERGE="python ../echo.py" hg merge
+  HG_FILE l
+  HG_MY_ISLINK 1
+  HG_OTHER_ISLINK 0
+  HG_BASE_ISLINK 0
+  merging l
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-# Test working directory symlink bit calculation wrt copies,
-# especially on non-supporting systems.
-echo % merge working directory
-hg up -C 2
-hg copy l l2
-HGMERGE="python ../echo.py" hg up 3
+Test working directory symlink bit calculation wrt copies,
+especially on non-supporting systems.
+merge working directory
+
+  $ hg up -C 2
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg copy l l2
+  $ HGMERGE="python ../echo.py" hg up 3
+  HG_FILE l2
+  HG_MY_ISLINK 1
+  HG_OTHER_ISLINK 0
+  HG_BASE_ISLINK 0
+  merging l2
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved