Merge remote branch 'smcv/ready/transient-tag'
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:11:06 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:11:06 +0000 (14:11 -0400)
Conflicts:
t/tag.t

1  2 
t/tag.t

diff --cc t/tag.t
+++ b/t/tag.t
@@@ -63,9 -64,10 +64,10 @@@ is_deeply([sort keys %autofiles], [qw(t
  ok(!-e "t/tmp/tags/lucky.mdwn");
  my (%pages, @del);
  IkiWiki::gen_autofile("tags/lucky.mdwn", \%pages, \@del);
- is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
- is_deeply(\@del, []);
- ok(-s "t/tmp/tags/lucky.mdwn");
 -is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
 -is_deeply(\@del, []) || diag explain \@del;
+ ok(! -s "t/tmp/tags/lucky.mdwn");
+ ok(-s "t/tmp/.ikiwiki/transient/tags/lucky.mdwn");
++is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
++is_deeply(\@del, []) || diag explain \@del;
  
  # generating an autofile that already exists does nothing
  %pages = @del = ();