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-rename-dir-merge.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 4416 bb1800a7d7e1
child 5244 dee573ba79f1
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:
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
adding a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
adding a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
copying a/a to b/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     5
 
copying a/b to b/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
removing a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     7
 
removing a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
resolving manifests
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    10
 
 overwrite None partial False
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    11
 
 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    12
 
 a/c: remote renamed directory to b/c -> d
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    13
 
 a/b: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    14
 
 a/a: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    15
 
 b/a: remote created -> g
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    16
 
 b/b: remote created -> g
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    17
 
removing a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    18
 
removing a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    19
 
moving a/c to b/c
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    20
 
getting b/a
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    21
 
getting b/b
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    22
 
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    23
 
(branch merge, don't forget to commit)
3748
7b88bd88f040 Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3735
diff changeset 
    24
 
a/* b/a b/b b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    25
 
M b/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    26
 
M b/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    27
 
A b/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    28
 
  a/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    29
 
R a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    30
 
R a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    31
 
R a/c
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    32
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    33
 
resolving manifests
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    34
 
 overwrite None partial False
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    35
 
 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    36
 
 None: local renamed directory to b/c -> d
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    37
 
getting a/c to b/c
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4311
diff changeset 
    38
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    39
 
(branch merge, don't forget to commit)
3748
7b88bd88f040 Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3735
diff changeset 
    40
 
a/* b/a b/b b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    41
 
A b/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    42
 
  a/c
mercurial-crew-with-dirclash