Mercurial > hg

comparison tests/test-convert-baz.out @ 7567:0946294d1f32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/gnuarch: fix switched copy source and destination Reported by Edouard Gomez <ed.gomez@free.fr>
author Patrick Mezard <pmezard@gmail.com>
date Mon, 05 Jan 2009 14:34:20 +0100
parents ebc23d34102f
children 7616ff5f3596
comparison
equal deleted inserted replaced
7566:5f7e3f17aece 7567:0946294d1f32
42 => src/.arch-ids/=id test/.arch-ids/=id 42 => src/.arch-ids/=id test/.arch-ids/=id
43 => src/.arch-ids/a-link.id test/.arch-ids/a-link.id 43 => src/.arch-ids/a-link.id test/.arch-ids/a-link.id
44 => src/.arch-ids/b.id test/.arch-ids/b.id 44 => src/.arch-ids/b.id test/.arch-ids/b.id
45 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-4 => baz--test--0--patch-5) 45 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-4 => baz--test--0--patch-5)
46 * committed baz@mercurial--convert/baz--test--0--patch-5 46 * committed baz@mercurial--convert/baz--test--0--patch-5
47 % move and add the moved file again
48 A .arch-ids/e.id
49 A e
50 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-5 => baz--test--0--patch-6)
51 * committed baz@mercurial--convert/baz--test--0--patch-6
52 A .arch-ids/e.id
53 A e
54 => .arch-ids/e.id .arch-ids/f.id
55 => e f
56 * update pristine tree (baz@mercurial--convert/baz--test--0--patch-6 => baz--test--0--patch-7)
57 * committed baz@mercurial--convert/baz--test--0--patch-7
47 % converting baz repo to Mercurial 58 % converting baz repo to Mercurial
48 initializing destination baz-repo-hg repository 59 initializing destination baz-repo-hg repository
49 analyzing tree version baz@mercurial--convert/baz--test--0... 60 analyzing tree version baz@mercurial--convert/baz--test--0...
50 scanning source... 61 scanning source...
51 sorting... 62 sorting...
52 converting... 63 converting...
53 5 initial import 64 7 initial import
54 4 added a file, src and src/b (binary) 65 6 added a file, src and src/b (binary)
55 3 added link to a and modify a 66 5 added link to a and modify a
56 2 added second link and modify b 67 4 added second link and modify b
57 1 file to link and link to file test 68 3 file to link and link to file test
58 0 move and rename a-link-2 file and src directory 69 2 move and rename a-link-2 file and src directory
70 1 add e
71 0 move e and recreate it again
59 % show graph log 72 % show graph log
73 o 7 "move e and recreate it again" files: e f
74 |
75 o 6 "add e" files: e
76 |
60 o 5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b 77 o 5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b
61 | 78 |
62 o 4 "file to link and link to file test" files: src/a-link-2 src/b 79 o 4 "file to link and link to file test" files: src/a-link-2 src/b
63 | 80 |
64 o 3 "added second link and modify b" files: src/a-link-2 src/b 81 o 3 "added second link and modify b" files: src/a-link-2 src/b
68 o 1 "added a file, src and src/b (binary)" files: a src/b 85 o 1 "added a file, src and src/b (binary)" files: a src/b
69 | 86 |
70 o 0 "initial import" files: 87 o 0 "initial import" files:
71 88
72 c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a 89 c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a
73 e3207be798aaf87a444a62903621edab4ddc1fb6 644 c 90 623942606de842342ac7b221ae9ccabc13b5d8c8 644 c
74 1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ test/a-link 91 1a4a864db0073705a11b1439f563bfa4b46d9246 644 e
75 1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ test/b 92 ab9089704d7c988687521e6adf018ebf767da7d6 644 f
93 43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link
94 73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b
95 copies: c (src/a-link-2) test/a-link (src/a-link) test/b (src/b)
96 copies: f (e)