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-simple-update.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 2955 9d1c3529ebbc
child 5405 8feb33c2d153
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: 749
diff changeset 
     1
 
adding foo
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     2
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     3
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     4
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     5
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     6
 
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 
     7
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
     8
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
     9
 
pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    10
 
searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    11
 
adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    12
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    13
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset 
    14
 
added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
    15
 
(run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    16
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    17
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    18
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    19
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    20
 
1 files, 2 changesets, 2 total revisions
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
    21
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    22
 
foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    23
 
bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    24
 
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo
mercurial-crew-with-dirclash