view tests/test-push-http.out @ 3869:ad6f34c83c3d

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
parents 109a22f5434a
children 8a3e12426c03
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect ssl error
pushing to http://localhost:20059/
searching for changes
ssl required
% expect authorization error
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect authorization error: must have authorized user
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect success
pushing to http://localhost:20059/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rolling back last transaction
changegroup: u=remote:http
% expect authorization error: all users denied
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect authorization error: some users denied, users must be authenticated
pushing to http://localhost:20059/
searching for changes
push not authorized