Mercurial > public > mercurial-scm > hg

diff tests/test-glog.t @ 16150:0424f3c7d7ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphlog: multiple --keyword must be or'ed
author Patrick Mezard <patrick@mezard.eu>
date Wed, 22 Feb 2012 12:30:15 +0100
parents 6acbbb0c7381
children 4a828d3bc04a
line wrap: on
line diff
--- a/tests/test-glog.t	Wed Feb 22 12:30:15 2012 +0100
+++ b/tests/test-glog.t	Wed Feb 22 12:30:15 2012 +0100
@@ -1435,8 +1435,8 @@
   abort: unknown revision 'not-a-branch'!
   $ testlog -b default -b branch
   ('group', ('group', ('or', ('func', ('symbol', 'branch'), ('string', 'default')), ('func', ('symbol', 'branch'), ('string', 'branch')))))
-  $ hg log -G --print-revset -k 'something' -k 'nice'
-  ('group', ('group', ('and', ('func', ('symbol', 'keyword'), ('string', 'something')), ('func', ('symbol', 'keyword'), ('string', 'nice')))))
+  $ testlog -k expand -k merge
+  ('group', ('group', ('or', ('func', ('symbol', 'keyword'), ('string', 'expand')), ('func', ('symbol', 'keyword'), ('string', 'merge')))))
   $ hg log -G --only-branch 'something nice'
   abort: unknown revision 'something nice'!
   [255]