# 
# patch "ChangeLog"
#  from [097d8f47e66d6e5bb6a37dd162dcb10f785b8f40]
#    to [ac39e611547d7c2b51c8a5da84499767346018f4]
# 
# patch "tests/t_db_kill_rev_locally.at"
#  from [7833b3652bf45b72b9fb6490b86fe2b66d7105ee]
#    to [a5043ae56c1d9ab1897594010d21b5e0851e572c]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-06-24  Nathaniel Smith  <address@hidden>
 
+	* tests/t_db_kill_rev_locally.at: Clean up style.
+
+2005-06-24  Nathaniel Smith  <address@hidden>
+
 	* unix/process.cc (process_spawn): Format log output correctly.
 
 2005-06-24  Nathaniel Smith  <address@hidden>
--- tests/t_db_kill_rev_locally.at
+++ tests/t_db_kill_rev_locally.at
@@ -1,24 +1,28 @@
 AT_SETUP([db kill_rev_locally command])
 MONOTONE_SETUP
 
 # This tests the db kill_rev_locally command
 
 # Prepare a db with two revisions
-AT_CHECK(echo "test">tmp, [], ignore, ignore)
-AT_CHECK(MONOTONE add tmp, [], ignore, ignore)
-AT_CHECK(MONOTONE --branch="test" --message="logtext" commit, [], ignore, stderr)
-ANCESTOR=`cat stderr|awk '/committed revision/ {print $4}'`
-AT_CHECK(echo "test2">>tmp, [], ignore, ignore)
-AT_CHECK(MONOTONE --message="logtext" commit, [], ignore, stderr)
-CHILD=`cat stderr|awk '/committed revision/ {print $4}'`
+ADD_FILE(testfile, [blah blah
+])
+COMMIT(testbranch)
+ANCESTOR=`BASE_REVISION`
 
+SET_FILE(testfile, [stuff stuff
+])
+COMMIT(testbranch)
+CHILD=`BASE_REVISION`
+
 # trying to kill the ancestor. This *is supposed to fail*
-AT_CHECK(MONOTONE db kill_rev_locally $ANCESTOR, [1], ignore, ignore)
-AT_CHECK(MONOTONE db check, [], ignore, ignore)
+AT_CHECK(MONOTONE db kill_rev_locally $ANCESTOR, [1], [ignore], [ignore])
+AT_CHECK(MONOTONE cat revision $ANCESTOR, [], [ignore], [ignore])
+AT_CHECK(MONOTONE db check, [], [ignore], [ignore])
 
 # killing children is ok, though :)
-AT_CHECK(MONOTONE db kill_rev_locally $CHILD, [], ignore, ignore)
+AT_CHECK(MONOTONE cat revision $CHILD, [], [ignore], [ignore])
+AT_CHECK(MONOTONE db kill_rev_locally $CHILD, [], [ignore], [ignore])
+AT_CHECK(MONOTONE cat revision $CHILD, [1], [ignore], [ignore])
 AT_CHECK(MONOTONE db check, [], ignore, ignore)
 
 AT_CLEANUP
-(END)