Mercurial > hg
view tests/test-hgweb-no-request-uri.out @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 3b93032516b3 |
children | dfb11f9922c1 |
line wrap: on
line source
changeset: 0:4cbec7e6f8c4 tag: tip user: Testing date: Thu Jan 01 00:00:00 1970 +0000 summary: test ---- HEADERS 200 Script output follows ---- DATA [('Content-Type', 'application/atom+xml; charset=ascii')] <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://www.w3.org/2005/Atom"> <!-- Changelog --> <id>http://127.0.0.1/</id> <link rel="self" href="http://127.0.0.1/atom-log"/> <link rel="alternate" href="http://127.0.0.1/"/> <title>repo Changelog</title> <updated>1970-01-01T00:00:00+00:00</updated> <entry> <title>test</title> <id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id> <link href="http://127.0.0.1/rev/4cbec7e6f8c4"/> <author> <name>Testing</name> <email>Testing</email> </author> <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> <div xmlns="http://www.w3.org/1999/xhtml"> <pre xml:space="preserve">test</pre> </div> </content> </entry> </feed> ---- ERRORS ---- HEADERS 200 Script output follows ---- DATA [('Content-Type', 'text/plain; charset=ascii')] -rw-r--r-- 4 bar ---- ERRORS ---- HEADERS 200 Script output follows ---- DATA [('Content-Type', 'text/plain; charset=ascii')] /repo/ ---- ERRORS ---- HEADERS 200 Script output follows ---- DATA [('Content-Type', 'text/plain; charset=ascii')] -rw-r--r-- 4 bar ---- ERRORS