# 
# 
# patch "ChangeLog"
#  from [b3c0896910eb519215425b633f452346fc96a189]
#    to [3f6e81d07abf72c1a7358c43a9a020d8b2cbfd2b]
# 
# patch "tests/t_sink_has_extra_epochs.at"
#  from [19d2749ea1dd8eed03de2f48c247970d416e790d]
#    to [0b9d5574dc645aac752334bf8d915551faf43faa]
# 
============================================================
--- ChangeLog	b3c0896910eb519215425b633f452346fc96a189
+++ ChangeLog	3f6e81d07abf72c1a7358c43a9a020d8b2cbfd2b
@@ -1,5 +1,8 @@
 2006-03-08  Matthew Gregan  <address@hidden>
 
+	* tests/t_sink_has_extra_epochs.at: Er, and also check for branch
+	names rather than revisions in the output of 'ls branches'.
+
 	* tests/t_sink_has_extra_epochs.at: Fix up subtle syntax error.
 
 	* lru_cache.h: Rename some enums to avoid namespace collisions on
============================================================
--- tests/t_sink_has_extra_epochs.at	19d2749ea1dd8eed03de2f48c247970d416e790d
+++ tests/t_sink_has_extra_epochs.at	0b9d5574dc645aac752334bf8d915551faf43faa
@@ -29,6 +29,7 @@
 NETSYNC_SERVE_STOP
 
 AT_CHECK(MONOTONE ls branches, [], [stdout], [ignore])
-AT_CHECK(QGREP `BASE_REVISION` stdout, [], [ignore], [ignore])
+AT_CHECK(QGREP testbranch stdout, [], [ignore], [ignore])
+AT_CHECK(QGREP otherbranch stdout, [], [ignore], [ignore])
 
 AT_CLEANUP