This is what darcs does when you pull in a patch that conflicts with
one of your local patches. It marks the conflicting variations in the
code. The conflict is then manually resolved (by editing the file) and
a new patch recorded. You will probably find the darcs manual helpful.
On Jul 12, 2006, at 4:02 AM, Werner Flamme wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
I just used the darcs plugin to update my installation. Something went wrong, in inc/template.php I read:
- ---snip--- v v v v v v v trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln');
Code from the incoming conflicting patch.
Code from the conflicting patch in your repository.
^ ^ ^ ^ ^ ^ ^ - ---pins---
and, of course, this is not valid PHP code. The line "return $html_output;"
I added for my PDF export (see
http://wiki.splitbrain.org/users:wflamme:pdfdownload). After adding this
line, I used "darcs record" so darcs should know about this line (and the
other changes I made for "pdfdownload").
// start trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln');
return $html_output; // end
Regards, Ben Coburn
------------------- silicodon.net -------------------
-- DokuWiki mailing list - more info at http://wiki.splitbrain.org/wiki:mailinglist