Commit Graph

6 Commits

Author SHA1 Message Date
Matt Mackall
5fef1977f2 update test-merge-types 2007-12-27 23:55:36 -06:00
Matt Mackall
2af988f28f add --debug to test-merge-types 2007-12-27 22:27:43 -06:00
Thomas Arendsen Hein
cb74375be7 Use skipped: instead of hghave: for skipping tests, use this in test-merge-types 2007-12-21 21:50:19 +01:00
Thomas Arendsen Hein
3aa5d6c16c Use common readlink.py instead of own implementations per test script. 2007-12-21 10:24:03 +01:00
Thomas Arendsen Hein
becde51102 Use test -h instead of test -L for portability
Citing from the GNU autoconf manual:
"either form conforms to Posix 1003.1-2001, but older shells like Solaris 8
 /bin/sh support only -h"
2007-12-21 09:51:19 +01:00
Bryan O'Sullivan
6605c95531 Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
2007-11-02 14:02:28 -07:00