Log Message:
Update to 2.5.4:
This fixes an urgent regression in merging with subrepos introduced in 2.5.
    applyupdates: assign variable before we try to use it (issue3855)
    setup.py: properly discard trust warning