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-rename-dir-merge.out
author Gilles Moris <gilles.moris@free.fr>
Thu, 21 Feb 2008 08:52:52 +0100
changeset 6161 bc1ba9124799
parent 5610 2493a478f395
child 6336 4b0c9c674707
permissions -rw-r--r--
Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout
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
5610
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5567
diff changeset 
     4
 
moving a/a to b/a
2493a478f395 copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents: 5567
diff changeset 
     5
 
moving a/b to b/b
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
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 
     7
 
resolving manifests
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
 overwrite None partial False
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    10
 
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    11
 
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    12
 
   a/c
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    13
 
   a/d
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    14
 
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    15
 
   b/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    16
 
   b/b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    17
 
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    18
 
   b/a -> a/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    19
 
   b/b -> a/b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    20
 
  checking for directory renames
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    21
 
  dir a/ -> b/
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    22
 
  file a/c -> b/c
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    23
 
  file a/d -> b/d
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    24
 
 a/d: remote renamed directory to b/d -> d
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    25
 
 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 
    26
 
 a/b: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    27
 
 a/a: other deleted -> r
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    28
 
 b/a: remote created -> g
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    29
 
 b/b: remote created -> g
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    30
 
removing a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    31
 
removing a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    32
 
moving a/c to b/c
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    33
 
moving a/d to b/d
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    34
 
getting b/a
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset 
    35
 
getting b/b
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    36
 
4 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 
    37
 
(branch merge, don't forget to commit)
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    38
 
a/* b/a b/b b/c b/d
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    39
 
M b/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    40
 
M b/b
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
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    43
 
R a/a
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    44
 
R a/b
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    45
 
R a/c
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    46
 
? b/d
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 
    47
 
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 
    48
 
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 
    49
 
resolving manifests
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    50
 
 overwrite None partial False
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    51
 
 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    52
 
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    53
 
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    54
 
   b/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    55
 
   b/b
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    56
 
   b/d
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    57
 
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    58
 
   a/c
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    59
 
  all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    60
 
   b/a -> a/a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    61
 
   b/b -> a/b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    62
 
  checking for directory renames
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    63
 
  dir a/ -> b/
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5229
diff changeset 
    64
 
  file a/c -> b/c
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    65
 
 None: local renamed directory to b/c -> d
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    66
 
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 
    67
 
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 
    68
 
(branch merge, don't forget to commit)
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    69
 
a/* b/a b/b b/c b/d
3735
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    70
 
A b/c
205f0fd4a4a1 Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    71
 
  a/c
5567
56e9f7b2d8fa rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset 
    72
 
? b/d
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 
    73
 
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
mercurial