update test-merge-types

tests/test-merge-types

@@ -1,38 +1,39 b''
 #!/bin/sh
 
 hg init
 echo a > a
 hg ci -Amadd       # 0
 
 chmod +x a
 hg ci -mexecutable # 1
 
 hg up 0
 rm a
 ln -s symlink a
 hg ci -msymlink    # 2
 hg merge --debug
 
 echo % symlink is local parent, executable is other
 
 if [ -h a ]; then
     echo a is a symlink
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
+else
+    echo "a has no flags (default for conflicts)"
 fi
 
 hg update -C 1
 hg merge --debug
 
 echo % symlink is other parent, executable is local
 
 if [ -h a ]; then
     echo a is a symlink
     $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
+else
+    echo "a has no flags (default for conflicts)"
 fi
-
-echo "skipped: test is for a known, unfixed bug"
-exit 80

tests/test-merge-types.out

@@ -1,1 +1,22 b''
-### This test is for a known, unfixed bug ###
+adding a
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+resolving manifests
+ overwrite None partial False
+ ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
+  searching for copies back to rev 1
+ a: update permissions -> e
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% symlink is local parent, executable is other
+a has no flags (default for conflicts)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+resolving manifests
+ overwrite None partial False
+ ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
+  searching for copies back to rev 1
+ a: remote is newer -> g
+getting a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% symlink is other parent, executable is local
+a has no flags (default for conflicts)