Mercurial > hg-stable
view tests/test-push-http.out @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | a3d73b3e1f8a |
children | ace3cf2bc991 |
line wrap: on
line source
adding a updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost/ searching for changes ssl required % serve errors % expect authorization error abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect authorization error: must have authorized user abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect success pushing to http://localhost/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files % serve errors changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http rolling back last transaction % expect authorization error: all users denied abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect authorization error: some users denied, users must be authenticated abort: authorization failed pushing to http://localhost/ searching for changes % serve errors