Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:10 -0600
changeset 1701 4ba8fe499df2
parent 925 5a034646e472
child 1744 385b06493465
permissions -rw-r--r--
hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge
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
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    12
 
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    13
 
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    14
 
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    15
 
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    16
 
1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    17
 
foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    18
 
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    19
 
pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    20
 
searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    21
 
no changes found
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 591
diff changeset 
    22
 
killed!
mercurial-crew-with-dirclash