Mercurial > hg > hg-fastimport

annotate tests/test-fastimport-anonbranch.out @ 47:7ff36dc9f0b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Massive rework to use infrastructure provided by convert extension. fastimport no longer stages changes in the repository's working copy; instead, it now works like any other convert source: the imported history is kept in memory (except for file contents) and then processed by the 'convert' extension.
author Greg Ward <greg-hg@gerg.ca>
date Sat, 16 May 2009 12:57:22 -0400
parents d246bcee93ec
children 1cf21a8c274b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
1 % import
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
2 scanning source...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
3 sorting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
4 converting...
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
5 6 initial revision
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
6 5 modify foo, add bla
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
7 4 add oog
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
8 3 modify bla
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
9 2 remove oog
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
10 1 modify foo
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
11 0 merge
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
12 Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ...
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
13 % log
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
14 o 6:ca2d9acb975f
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
15 |\ merge
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
16 | |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
17 | o 5:426c5bd79694
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
18 | | modify foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
19 | |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
20 o | 4:32f018ede0f8
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
21 | | remove oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
22 | |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
23 | o 3:7c78b201cf49
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
24 | | modify bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
25 | |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
26 o | 2:b4dd3ea3dee1
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
27 |/ add oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
28 |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
29 o 1:60da203876bc
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
30 | modify foo, add bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
31 |
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
32 o 0:2eab317db71a
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
33 initial revision
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
34
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
35 % manifest at rev 0
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
36 bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
37 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
38 % manifest at rev 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
39 bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
40 bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
41 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
42 % contents of foo at rev 3
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
43 oof
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
44 % contents of bla at rev 3
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
45 blah blah
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
46 % contents of foo at rev 5
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
47 foo foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
48 % contents of foo at rev 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
49 oof
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
50 % contents of bar at rev 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
51 bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
52 % contents of bla at rev 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
53 blah blah
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
54 % diff merge with first parent (rev 4:6)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
55 diff -r 32f018ede0f8 -r ca2d9acb975f bla
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
56 --- a/bla Thu Jan 10 21:23:00 2008 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
57 +++ b/bla Thu Jan 10 21:24:00 2008 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
58 @@ -1,1 +1,1 @@
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
59 -bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
60 +blah blah
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
61 % diff merge with second parent (rev 5:6)
47
7ff36dc9f0b1 Massive rework to use infrastructure provided by convert extension.
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
62 diff -r 426c5bd79694 -r ca2d9acb975f foo
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
63 --- a/foo Thu Jan 10 21:23:30 2008 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
64 +++ b/foo Thu Jan 10 21:24:00 2008 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
65 @@ -1,1 +1,1 @@
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
66 -foo foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
67 +oof