view tests/test-rename-after-merge.out @ 6262:de7256c82fad

hgweb: clarify which address and port can/cannot be bound at startup (bug 769)

The error message at startup when the address/port could not be bound
was confusing:

    hg serve
    abort: cannot start server: Address already in use

Be more explicit:

    $ hg serve -a localhost
    abort: cannot start server at 'localhost:8000': Address already in use

Also be more explicit on success, showing hostname and ip address/port:

    $ hg -v serve -a localhost -p 80
    listening at http://localhost/ (127.0.0.1:80)


We are careful to handle a missconfigured machine whose hostname does not
resolve, falling back to the address given at the command line.

Remove a dead-code error message.

% create source repository
adding a
% fork source repository
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b
% rename b as c
A c
R b
% rename back c as b
M b