projects / ikiwiki.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 775fefe) | patch
avoid error if two source files render the same destination file
authorJoey Hess <joey@kitenet.net>
Sun, 18 Jul 2010 20:28:39 +0000 (16:28 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Jul 2010 20:28:39 +0000 (16:28 -0400)
commit773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe
tree82a81b26153f174357a89ae67519151c0ea5372etree | snapshot
parent775fefeea72209cc4eae1bbe314bd94491bcb1b3commit | diff
avoid error if two source files render the same destination file

There are two sub-caces. If both source files still exist, the winner that
renders the destination file is undefined. If one source file is deleted
and the other added, in a refresh, the new file will take over the
destination file.
IkiWiki.pm diff | blob | history
t/conflicts.t diff | blob | history
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.