# 
# 
# add_file "tests/t_log_nofiles_merges.at"
#  content [958b5e4229b1afd2c7ec131d0a239b28d792815f]
# 
# patch "ChangeLog"
#  from [29bbfc598b0500c607bb77e6037d9c45d167980d]
#    to [9fe5f1edb4fd1051f924420ad7fe481478468ff1]
# 
# patch "testsuite.at"
#  from [80c4c93321cbbc480f7743a17bf199722cf7a739]
#    to [792107ac25e4c25902f38278764ec9a15cdad47d]
# 
============================================================
--- tests/t_log_nofiles_merges.at	958b5e4229b1afd2c7ec131d0a239b28d792815f
+++ tests/t_log_nofiles_merges.at	958b5e4229b1afd2c7ec131d0a239b28d792815f
@@ -0,0 +1,41 @@
+AT_SETUP([log --no-files and --merges])
+MONOTONE_SETUP
+
+ADD_FILE(testfile, [blah blah
+])
+COMMIT(testbranch)
+R1=`BASE_REVISION`
+
+# check that changed (added) file is listed in the log output
+AT_CHECK(MONOTONE log, [], [stdout], [ignore])
+AT_CHECK(grep testfile stdout, [], [ignore])
+
+# and that it has been excluded by --no-files
+AT_CHECK(MONOTONE log --no-files, [], [stdout], [ignore])
+AT_CHECK(grep testfile stdout, [1], [ignore])
+
+# add create some divergence...
+SET_FILE(testfile, [stuff stuff
+])
+COMMIT(testbranch)
+
+REVERT_TO($R1)
+
+ADD_FILE(nufile, [moo moo
+])
+COMMIT(testbranch)
+
+# ...and now merge it cleanly
+AT_CHECK(MONOTONE merge, [], [ignore], [ignore])
+AT_CHECK(MONOTONE update, [], [ignore], [ignore])
+R2=`BASE_REVISION`
+
+# check that merge is excluded from log output
+AT_CHECK(MONOTONE log, [], [stdout], [ignore])
+AT_CHECK(grep '^Revision' stdout | grep $R2, [1], [ignore])
+
+# and that it has been included by --merges
+AT_CHECK(MONOTONE log --merges, [], [stdout], [ignore])
+AT_CHECK(grep '^Revision' stdout | grep $R2, [], [ignore])
+
+AT_CLEANUP
============================================================
--- ChangeLog	29bbfc598b0500c607bb77e6037d9c45d167980d
+++ ChangeLog	9fe5f1edb4fd1051f924420ad7fe481478468ff1
@@ -1,3 +1,10 @@
+2006-02-18  Matthew Gregan  <address@hidden>
+
+	* tests/t_log_nofiles_merges.at: Add test for the log options
+	--no-files and --merges.
+
+	* testsuite.at: Add t_log_nofiles_merges.at.
+
 2006-02-13  Nathaniel Smith  <address@hidden>
 
 	* roster_merge.cc (log_conflicts): Tweak string.
@@ -14,7 +21,7 @@
 2006-02-18  Matthew Gregan  <address@hidden>
 
 	* tests/t_db_kill_rev_locally_2.at: Add an XFAIL test for a
-	kill_rev_locally bug reported by Daniel Carasone.
+	kill_rev_locally bug reported by Daniel Carosone.
 
 	* testsuite.at: Add t_db_kill_rev_locally_2.at.
 
============================================================
--- testsuite.at	80c4c93321cbbc480f7743a17bf199722cf7a739
+++ testsuite.at	792107ac25e4c25902f38278764ec9a15cdad47d
@@ -759,3 +759,4 @@
 m4_include(tests/t_ls_changed.at)
 m4_include(tests/t_revert_new_project.at)
 m4_include(tests/t_db_kill_rev_locally_2.at)
+m4_include(tests/t_log_nofiles_merges.at)