Mercurial > hg
annotate tests/cgienv @ 28103:7d852bb47b0a
merge: give priority to "not at head" failures for bare 'hg merge'
We refuse to pick a destination for a bare 'hg merge' if the working copy is not
at head. This is meant to prevent strange merge from user who forget to update.
(Moreover, such merge does not reduce actually the number of heads)
However, we were doing that as the last possible failure type. So user were
recommended to merge with an explicit head (from this bad location) if the
branch had too many heads.
We now make "not on branch heads" class of failure the first things to check
and fail on. The one test that change was actually trying to check for these
failure (and did not). The new test output is correct.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 08 Feb 2016 14:55:58 +0100 |
parents | aa3f726a2bdb |
children |
rev | line source |
---|---|
13269
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
1 DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
2 GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
3 HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
4 HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
5 HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
6 HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
7 HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
8 HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
9 HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
10 HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
11 HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
12 PATH_INFO="/"; export PATH_INFO |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
13 PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
14 QUERY_STRING=""; export QUERY_STRING |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
15 REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
16 REMOTE_PORT="44703"; export REMOTE_PORT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
17 REQUEST_METHOD="GET"; export REQUEST_METHOD |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
18 REQUEST_URI="/test/"; export REQUEST_URI |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
19 SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
20 SCRIPT_NAME="/test"; export SCRIPT_NAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
21 SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
22 SCRIPT_URL="/test/"; export SCRIPT_URL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
23 SERVER_ADDR="127.0.0.1"; export SERVER_ADDR |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
24 SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
25 SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
26 SERVER_PORT="80"; export SERVER_PORT |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
27 SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
28 SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE |
aa3f726a2bdb
tests: remove duplication of the CGI environment variables
StevenGBrown
parents:
diff
changeset
|
29 SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE |