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-pull.out
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 10398 ace3cf2bc991
child 10886 38f2ef9c134b
permissions -rw-r--r--
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 642
diff changeset 
     1
 
adding foo
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     2
 
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     3
 
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     4
 
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     5
 
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     6
 
1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     7
 
requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     8
 
adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
     9
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    10
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    11
 
added 1 changesets with 1 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset 
    12
 
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
    13
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    14
 
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    15
 
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    16
 
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    17
 
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    18
 
1 files, 1 changesets, 1 total revisions
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
    19
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    20
 
foo
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5384
diff changeset 
    21
 
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
10398
ace3cf2bc991 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents: 9996
diff changeset 
    22
 
pulling from http://localhost:$HGPORT/
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    23
 
searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    24
 
no changes found
4891
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    25
 
% issue 622
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    26
 
pulling from ../test
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    27
 
requesting all changes
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    28
 
adding changesets
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    29
 
adding manifests
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    30
 
adding file changes
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    31
 
added 1 changesets with 1 changes to 1 files
2d545b98a7bc issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    32
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9996
2770d03ae49f handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents: 9611
diff changeset 
    33
 
% test file: uri handling
2770d03ae49f handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents: 9611
diff changeset 
    34
 
abort: repository /test-doesnt-exist not found!
Mercurial