Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 2337:3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
problems fixed:
- https scheme handled properly for real and proxy urls.
- url of form "http://user:password@host:port/path" now ok.
- no-proxy check uses proper host names.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Mon, 22 May 2006 15:42:49 -0700 |
| parents | b2ae81a7df29 |
| children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% merge should fail abort: 'b' already exists in the working dir and differs from remote %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) %% 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Contents of b should be "this is file b1" This is file b1 %% merge fails abort: outstanding uncommitted changes %% merge expected! merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)