[Pmwiki-users] phpdiff and PmWiki's Patch()

[Patrick R. Michaud]

Well, the patch that comes with PmWiki ought to be able to handle
the diff output.  The biggest issue is that the changes output by
the diff command have to be in the correct sequence for the patch
algorithm to be able to reapply them -- basically, they have to be
in ascending sequence by line number.

Pm

On Sun, May 16, 2004 at 06:33:34PM +0200, Nils Knappmeier wrote:
> 
> >Nils, is it possible that the phpdiff.php is producing output that
> >is somehow slightly different from what /usr/bin/diff would produce?
> >It seems to me that the patch algorithm introduced in 0.6.18 ought to
> >work with the output of phpdiff.php...
> > 
> >
> Well, the algorithm is different, so it sometimes doesn't produce 
> optimal results (as noted in the cookbook).
> However, the diffs were compatible with patch all my tests so far. 
> (That's why I made up that diff- and patchGround at 
> http://www.fachschaft.informatik.tu-darmstadt.de/~nknapp/pmwiki/)
> 
> Franco, can you give me a link to that page where the patch doesn't work 
> (or even better: send me the file itself.)
> 
> Nils
> 
> 
> > 
> >
> >>Also, as I previously reported to the list, I'm still not able to see 
> >>the "extended" include syntax working on my site. In fact when I use in 
> >>my wiki the simple syntax: [[include:Pagename]] it works, but if I try 
> >>the extended syntax: [[include:Pagename##]] it doesn't ...
> >>   
> >>
> >
> >What about it doesn't work?
> >
> >Pm
> >
> > 
> >
> 
> 
> 
> -- 
> Pmwiki-users mailing list
> Pmwiki-users at pmichaud.com
> http://pmichaud.com/mailman/listinfo/pmwiki-users_pmichaud.com