Mercurial Mercurial > mercurial / 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 Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 May 2006 18:44:02 +0200
changeset 2175 b2ae81a7df29
parent 2152 57729c56a23c
child 2182 4e35843b2683
permissions -rw-r--r--
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
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
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
    12
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    13
 
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    14
 
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    15
 
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    16
 
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    17
 
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 
    18
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    19
 
foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset 
    20
 
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    21
 
pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    22
 
searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset 
    23
 
no changes found
mercurial