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 Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 4912 c4dd58af0fc8
child 5384 e3a0c092b4e2
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
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
4912
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    24
 
% issue 622
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    25
 
pulling from ../test
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    26
 
requesting all changes
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    27
 
adding changesets
c4dd58af0fc8 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 manifests
c4dd58af0fc8 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 file changes
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    30
 
added 1 changesets with 1 changes to 1 files
c4dd58af0fc8 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents: 2955
diff changeset 
    31
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mercurial-crew-with-dirclash