# # # add_file "tests/t_log_selectors.at" # content [0aef36f600f5bde7f9a636d03eaf9ef9f67e3537] # # patch "ChangeLog" # from [fc521557f68a948cbe747181cd25ef2d1b221a01] # to [a7881c874204701800cd0878af8daa6eae7c3dae] # # patch "testsuite.at" # from [502fc24beaf3a23cd7858204ba755a78c94a3867] # to [199b89315099d7c9144012a81b87fbbee16fdfca] # ============================================================ --- tests/t_log_selectors.at 0aef36f600f5bde7f9a636d03eaf9ef9f67e3537 +++ tests/t_log_selectors.at 0aef36f600f5bde7f9a636d03eaf9ef9f67e3537 @@ -0,0 +1,28 @@ +AT_SETUP([log and selectors returning multiple rids]) +MONOTONE_SETUP + +# an xfailed testcase for bug #15877 + +AT_XFAIL_IF(true) + +ADD_FILE(testfile, [blah blah +]) +AT_CHECK(MONOTONE commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) +R0=`BASE_REVISION` + +SET_FILE(testfile, [stuff stuff +]) +AT_CHECK(MONOTONE commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) +R1=`BASE_REVISION` + +SET_FILE(testfile, [other other +]) +AT_CHECK(MONOTONE commit -b otherbranch --date "2005-08-16T03:16:05" -m foo, [], [ignore], [ignore]) +R2=`BASE_REVISION` + +AT_CHECK(MONOTONE log --revision d:2005-08-16, [], [stdout], [ignore]) +AT_CHECK(grep $R0 stdout) +AT_CHECK(grep $R1 stdout) +AT_CHECK(grep $R2 stdout) + +AT_CLEANUP ============================================================ --- ChangeLog fc521557f68a948cbe747181cd25ef2d1b221a01 +++ ChangeLog a7881c874204701800cd0878af8daa6eae7c3dae @@ -1,5 +1,9 @@ 2006-02-23 Matthew Gregan + * tests/t_log_selectors.at: XFAILed test for bug #15877. + + * testsuite.at: Add it. + * app_state.cc, app_state.hh, commands.cc, monotone.cc, options.hh: Revert failed UI experiment: reenable logging merges by default and rename --merges back to --no-merges. ============================================================ --- testsuite.at 502fc24beaf3a23cd7858204ba755a78c94a3867 +++ testsuite.at 199b89315099d7c9144012a81b87fbbee16fdfca @@ -779,3 +779,4 @@ m4_include(tests/t_log_nofiles_nomerges.at) m4_include(tests/t_cvsimport_branch.at) m4_include(tests/t_log_to_file.at) +m4_include(tests/t_log_selectors.at)