# 
# patch "ChangeLog"
#  from [da0903a8dc7783edbfefec3a310e316fc327adeb]
#    to [d0e377317e4441c36332468c507c916728728ecc]
# 
# patch "tests/t_sticky_branch.at"
#  from [7ad4b1f57c40c5f82854acb9f4d275fe9744144c]
#    to [a54a5cc4d95a7d7b47b4d4458e26868c28dad48e]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,4 +1,7 @@
 2005-04-20  Jon Bright  <address@hidden>
+	* tests/t_sticky_branch.at: Really fix this test
+
+2005-04-20  Jon Bright  <address@hidden>
 	* tests/t_sticky_branch.at: Canonicalise stdout before comparison
 	* tests/t_setup_checkout_modify_new_dir.at: Ditto
 	* tests/t_netsync_largish_file.at: Check the file out rather
--- tests/t_sticky_branch.at
+++ tests/t_sticky_branch.at
@@ -20,8 +20,11 @@
 AT_DATA(codir/foo, [more more
 ])
 AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE ls branches, [], [testbranch
+AT_DATA(expbranches, [testbranch
 ], [])
+AT_CHECK(MONOTONE ls branches, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
+AT_CHECK(cmp expbranches stdout)
 
 # commit saves given branch
 AT_DATA(codir/foo, [newbranch newbranch
@@ -62,7 +65,6 @@
 AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore])
 # we check that this didn't create a new head of branch third
 AT_CHECK(MONOTONE automate heads third, [], [stdout], [ignore])
-AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp stdout old-third-heads)
 
 AT_CLEANUP