Re: [Monotone-devel] ikiwiki monotone support

[William Uther]

On 23/02/2008, at 11:50 AM, Brian May wrote:

> > > > > > "Brian" == Brian May <address@hidden> writes:
>
>    Brian> -	          "--label", string.format("[Yours]",      
> tbl.left_path ),
>    Brian> -	          "--label", string.format("[Original]",   
> tbl.anc_path  ),
>    Brian> -	          "--label", string.format("[Theirs]",     
> tbl.right_path),
>
> These labels have changed:
>
>        local diff3 = {
>            "diff3",
>            "--merge",
>            "--label", string.format("%s [left]",     tbl.left_path ),
>            "--label", string.format("%s [ancestor]", tbl.anc_path  ),
>            "--label", string.format("%s [right]",    tbl.right_path),
>        }
>
> Oh well, I think it is worth the code simplification.

Yes!  You might want to have a version check in the ikiwiki code.   
Those mergers
were only added to monotone rather recently.  In fact, I think that I  
had the
ikiwiki mergerc set up to the standard hooks if they existed (at least  
for part
of it), but define its own version if they didn't.  A version check is  
probably
simpler.

Cheers,

Will        :-}