[Monotone-devel] Re: various faults in the 0.10 netsync implementation

[graydon hoare]

Christof Petig wrote:
> graydon hoare schrieb:
>
> > (christof: this also includes you; the adler32 change I settled on is
> >  not the one you suggested, so you will probably get broken checksums
> >  until you fetch again)
>
>
> I fetched again and wondered about the following message:
>
> $ monotone update
> monotone: selected update target 9fa1750d2c929f7fd3ce6cebba108904e1a39a82
> monotone: misuse: manifest merge failed, no update performed
>
> **** error return code 1
> **********  errors detected; see standard output for details  ***********
>
> not really informative, is it? --verbose shows what's up:

yeah. at that point is was supposed to run an external 3-way merger 
program on the 3 files conflicting. I can think of a few reasons it 
might have failed:

  - you had the std_hooks.lua built into your monotone which came with
    0.10, which as I noted in the last email, has a bug which fails to
    read return values correctly.

    (but that would assume that xxdiff or emacs was actually *run*)

  - if neither of them were run, perhaps you don't have either in your
    $PATH, or more accurately perhaps "which xxdiff" or "which emacs"
    do not return anything.

  - even then, it is possible that you had an X DISPLAY or similar
    setting such that the programs started but failed immediately.

  - it's also possible that there was an eror invoking the hook, or
    somehow monotone didn't get to the code path involving the hook.
    that would be a bug.

-graydon