Mercurial > hg
view tests/test-convert-tla.out @ 8861:90f74b31ed4f
filemerge: fix internal:dump
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 20 Jun 2009 16:42:51 -0500 |
parents | 0946294d1f32 |
children | f2618cacb485 |
line wrap: on
line source
% create tla archive % initialize tla repo * creating version tla@mercurial--convert/tla--test--0 * imported tla@mercurial--convert/tla--test--0 % create initial files A/ .arch-ids A/ src A/ src/.arch-ids A .arch-ids/a.id A a A src/.arch-ids/=id A src/.arch-ids/b.id A src/b * update pristine tree (tla@mercurial--convert/tla--test--0--base-0 => tla--test--0--patch-1) * committed tla@mercurial--convert/tla--test--0--patch-1 % create link file and modify a A src/.arch-ids/a-link.id A src/a-link M a * update pristine tree (tla@mercurial--convert/tla--test--0--patch-1 => tla--test--0--patch-2) * committed tla@mercurial--convert/tla--test--0--patch-2 % create second link and modify b A src/.arch-ids/a-link-2.id A src/a-link-2 Mb src/b * update pristine tree (tla@mercurial--convert/tla--test--0--patch-2 => tla--test--0--patch-3) * committed tla@mercurial--convert/tla--test--0--patch-3 % b file to link and a-link-2 to regular file fl src/b lf src/a-link-2 * update pristine tree (tla@mercurial--convert/tla--test--0--patch-3 => tla--test--0--patch-4) * committed tla@mercurial--convert/tla--test--0--patch-4 % move a-link-2 file and src directory D/ src/.arch-ids A/ test/.arch-ids /> src test => src/.arch-ids/a-link-2.id .arch-ids/c.id => src/a-link-2 c => src/.arch-ids/=id test/.arch-ids/=id => src/.arch-ids/a-link.id test/.arch-ids/a-link.id => src/.arch-ids/b.id test/.arch-ids/b.id * update pristine tree (tla@mercurial--convert/tla--test--0--patch-4 => tla--test--0--patch-5) * committed tla@mercurial--convert/tla--test--0--patch-5 % converting tla repo to Mercurial initializing destination tla-repo-hg repository analyzing tree version tla@mercurial--convert/tla--test--0... scanning source... sorting... converting... 5 initial import 4 added a file, src and src/b (binary) 3 added link to a and modify a 2 added second link and modify b 1 file to link and link to file test 0 move and rename a-link-2 file and src directory % show graph log 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 | o 4 "file to link and link to file test" files: src/a-link-2 src/b | o 3 "added second link and modify b" files: src/a-link-2 src/b | o 2 "added link to a and modify a" files: a src/a-link | o 1 "added a file, src and src/b (binary)" files: a src/b | o 0 "initial import" files: c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a 623942606de842342ac7b221ae9ccabc13b5d8c8 644 c 43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link 73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b