Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-fetch.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Feb 2008 13:01:27 +0100
changeset 6133 779f2309d67a
parent 5798 86f5d8f608b7
child 6206 0b6f12495276
permissions -rw-r--r--
Add hg grep -d/--date to list the commit date of matched revisions. Suggested by Greg Lindahl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
adding b
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
1:97d72e5f12c7
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
% should pull one change
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
pulling from ../a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
searching for changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
adding changesets
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
adding manifests
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
adding file changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
added 1 changesets with 1 changes to 1 files
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
1:97d72e5f12c7
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
adding c
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    16
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    17
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    18
 
pulling from ../a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    19
 
searching for changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    20
 
adding changesets
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    21
 
adding manifests
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    22
 
adding file changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    23
 
added 1 changesets with 1 changes to 1 files (+1 heads)
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    24
 
merging with new head 2:97d72e5f12c7
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    25
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2823
e0caea53c997 test-fetch: make output stable
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2822
diff changeset 
    26
 
new changeset 3:cd3a41621cf0 merges remote changes with local
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    27
 
a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    28
 
b
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    29
 
c
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    30
 
% fetch over http, no auth
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    31
 
pulling from http://localhost:20059/
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    32
 
searching for changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    33
 
adding changesets
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    34
 
adding manifests
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    35
 
adding file changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    36
 
added 1 changesets with 1 changes to 1 files (+1 heads)
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    37
 
merging with new head 2:97d72e5f12c7
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    38
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    39
 
new changeset 3:0b6439e938f9 merges remote changes with local
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    40
 
Automated merge with http://localhost:20059/
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    41
 
% fetch over http with auth (should be hidden in desc)
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    42
 
pulling from http://user:***@localhost:20059/
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    43
 
searching for changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    44
 
adding changesets
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    45
 
adding manifests
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    46
 
adding file changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    47
 
added 1 changesets with 1 changes to 1 files (+1 heads)
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    48
 
merging with new head 2:97d72e5f12c7
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    49
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    50
 
new changeset 3:0b6439e938f9 merges remote changes with local
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    51
 
Automated merge with http://localhost:20059/
Mercurial