Mercurial > hg
comparison tests/test-fetch.out @ 5798:86f5d8f608b7
fetch: hide authentication details
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 04 Jan 2008 11:58:27 -0800 |
parents | e0caea53c997 |
children | 0b6f12495276 |
comparison
equal
deleted
inserted
replaced
5797:7b7f03c7dfa5 | 5798:86f5d8f608b7 |
---|---|
11 adding file changes | 11 adding file changes |
12 added 1 changesets with 1 changes to 1 files | 12 added 1 changesets with 1 changes to 1 files |
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 1:97d72e5f12c7 | 14 1:97d72e5f12c7 |
15 adding c | 15 adding c |
16 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 pulling from ../a | 18 pulling from ../a |
17 searching for changes | 19 searching for changes |
18 adding changesets | 20 adding changesets |
19 adding manifests | 21 adding manifests |
20 adding file changes | 22 adding file changes |
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
24 new changeset 3:cd3a41621cf0 merges remote changes with local | 26 new changeset 3:cd3a41621cf0 merges remote changes with local |
25 a | 27 a |
26 b | 28 b |
27 c | 29 c |
30 % fetch over http, no auth | |
31 pulling from http://localhost:20059/ | |
32 searching for changes | |
33 adding changesets | |
34 adding manifests | |
35 adding file changes | |
36 added 1 changesets with 1 changes to 1 files (+1 heads) | |
37 merging with new head 2:97d72e5f12c7 | |
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
39 new changeset 3:0b6439e938f9 merges remote changes with local | |
40 Automated merge with http://localhost:20059/ | |
41 % fetch over http with auth (should be hidden in desc) | |
42 pulling from http://user:***@localhost:20059/ | |
43 searching for changes | |
44 adding changesets | |
45 adding manifests | |
46 adding file changes | |
47 added 1 changesets with 1 changes to 1 files (+1 heads) | |
48 merging with new head 2:97d72e5f12c7 | |
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 new changeset 3:0b6439e938f9 merges remote changes with local | |
51 Automated merge with http://localhost:20059/ |