From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 18:11:06 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/transient-tag'
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=8e8311718a0ca4d52aa86a9c8cc439430b11a468

Merge remote branch 'smcv/ready/transient-tag'

Conflicts:
	t/tag.t
---

8e8311718a0ca4d52aa86a9c8cc439430b11a468
diff --cc t/tag.t
index 2d0a6e662,0d360b06e..9f2a8f3ec
--- a/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 = ();