diff -r 30b602168c3b -r 9601229ed361 tests/test-glog.t --- a/tests/test-glog.t Sun Nov 16 23:41:44 2014 -0800 +++ b/tests/test-glog.t Fri Dec 05 14:27:32 2014 -0800 @@ -1658,13 +1658,17 @@ $ testlog -f dir [] (group - (func - ('symbol', '_matchfiles') - (list + (and + (func + ('symbol', '_matchfiles') (list - ('string', 'r:') - ('string', 'd:relpath')) - ('string', 'p:dir')))) + (list + ('string', 'r:') + ('string', 'd:relpath')) + ('string', 'p:dir'))) + (func + ('symbol', 'ancestors') + ('symbol', '.')))) $ hg up -q tip Test --follow on file not in parent revision @@ -1679,13 +1683,17 @@ $ testlog -f 'glob:*' [] (group - (func - ('symbol', '_matchfiles') - (list + (and + (func + ('symbol', '_matchfiles') (list - ('string', 'r:') - ('string', 'd:relpath')) - ('string', 'p:glob:*')))) + (list + ('string', 'r:') + ('string', 'd:relpath')) + ('string', 'p:glob:*'))) + (func + ('symbol', 'ancestors') + ('symbol', '.')))) Test --follow on a single rename @@ -1852,13 +1860,17 @@ $ testlog --removed --follow a [] (group - (func - ('symbol', '_matchfiles') - (list + (and + (func + ('symbol', '_matchfiles') (list - ('string', 'r:') - ('string', 'd:relpath')) - ('string', 'p:a')))) + (list + ('string', 'r:') + ('string', 'd:relpath')) + ('string', 'p:a'))) + (func + ('symbol', 'ancestors') + ('symbol', '.')))) Test --patch and --stat with --follow and --follow-first