Mercurial > hg
view tests/test-rebase-abort.out @ 10674:6d87c20cd7a8 stable
hgweb: fix broken URLs of RSS/Atom feeds (issue1772)
This fixes doubled URL, e.g. http://example.orghttp://example.org/...,
which appears on RSS/Atom feeds served by hgwebdir.
It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME,
according to RFC 3875.
Updated the test output since SCRIPT_NAME becomes not to contain
http://host:port part.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 11 Mar 2010 00:28:27 +0900 |
parents | 808f03f61ebe |
children | b345b1cc124f |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Abort rebase aborted @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1