tests/test-rename-dir-merge.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Feb 2008 18:07:55 -0200
changeset 6031 7383384793fb
parent 5371 17ed9b9a0d03
child 5567 56e9f7b2d8fa
permissions -rw-r--r--
revert: don't assume ignored files will be returned in the unknown list That's just an artifact of the current implementation, and I'll change that soon. Bonus points: - we don't care about the unknown list at all - we don't print an extra message if we try to revert a removed file that is not present in the target revision
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
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    12
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    13
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    14
   a/c
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    15
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    16
   b/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    17
   b/b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    18
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    19
   b/a -> a/a 
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    20
   b/b -> a/b 
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    21
  checking for directory renames
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    22
  dir a/ -> b/
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    23
  file a/c -> b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    24
 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: 4304
diff changeset
    25
 a/b: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    26
 a/a: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    27
 b/a: remote created -> g
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    28
 b/b: remote created -> g
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    29
removing a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    30
removing a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    31
moving a/c to b/c
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    32
getting b/a
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    33
getting b/b
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    34
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
    35
(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
    36
a/* b/a b/b b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    37
M b/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    38
M b/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    39
A b/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    40
  a/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    41
R a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    42
R a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    43
R a/c
5229
dee573ba79f1 correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4416
diff changeset
    44
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    45
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
    46
resolving manifests
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    47
 overwrite None partial False
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    48
 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    49
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    50
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    51
   b/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    52
   b/b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    53
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    54
   a/c
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    55
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    56
   b/a -> a/a 
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    57
   b/b -> a/b 
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    58
  checking for directory renames
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    59
  dir a/ -> b/
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset
    60
  file a/c -> b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    61
 None: local renamed directory to b/c -> d
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    62
getting a/c to b/c
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
    63
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
    64
(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
    65
a/* b/a b/b b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    66
A b/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    67
  a/c
5229
dee573ba79f1 correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4416
diff changeset
    68
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88