Mercurial > hg
comparison tests/test-convert-git.out @ 5380:a5a7f7fd5554
convert_git: add --filemap support
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 9c0f864fddca |
children | 8feb33c2d153 |
comparison
equal
deleted
inserted
replaced
5379:d3e51dc804f8 | 5380:a5a7f7fd5554 |
---|---|
21 Merge branch other | 21 Merge branch other |
22 | 22 |
23 committer: test <test@example.org> | 23 committer: test <test@example.org> |
24 | 24 |
25 | 25 |
26 % full conversion | |
27 o 9 "Discard change to foo" files: foo | |
28 |\ | |
29 | o 8 "change foo" files: foo | |
30 | | | |
31 o | 7 "change bar" files: bar | |
32 |/ | |
33 o 6 "(octopus merge fixup)" files: | |
34 |\ | |
35 | o 5 "Octopus merge" files: baz | |
36 | |\ | |
37 o | | 4 "add baz" files: baz | |
38 | | | | |
39 +---o 3 "add bar" files: bar | |
40 | | | |
41 o | 2 "add quux" files: quux | |
42 | | | |
43 | o 1 "change foo" files: foo | |
44 |/ | |
45 o 0 "add foo" files: foo | |
46 | |
47 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | |
48 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | |
49 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | |
50 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | |
51 % foo bar baz: octopus merge | |
52 o 8 "Discard change to foo" files: foo | |
53 |\ | |
54 | o 7 "change foo" files: foo | |
55 | | | |
56 o | 6 "change bar" files: bar | |
57 |/ | |
58 o 5 "(octopus merge fixup)" files: | |
59 |\ | |
60 | o 4 "Octopus merge" files: baz | |
61 | |\ | |
62 o | | 3 "add baz" files: baz | |
63 | | | | |
64 +---o 2 "add bar" files: bar | |
65 | | | |
66 | o 1 "change foo" files: foo | |
67 |/ | |
68 o 0 "add foo" files: foo | |
69 | |
70 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | |
71 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | |
72 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | |
73 % foo baz quux: only some parents of an octopus merge; "discard" a head | |
74 o 6 "Discard change to foo" files: foo | |
75 | | |
76 o 5 "change foo" files: foo | |
77 | | |
78 o 4 "Octopus merge" files: | |
79 |\ | |
80 | o 3 "add baz" files: baz | |
81 | | | |
82 | o 2 "add quux" files: quux | |
83 | | | |
84 o | 1 "change foo" files: foo | |
85 |/ | |
86 o 0 "add foo" files: foo | |
87 | |
88 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | |
89 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | |
90 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux |