Mercurial > hg > hg-fastimport

annotate tests/test-fastimport-anonbranch.out @ 48:1cf21a8c274b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapt to upstream changes in pyfastimport. - use parse(), not iter_commands() - changeset hashes differ for streams with inline file contents
author Greg Ward <greg-hg@gerg.ca>
date Sun, 17 May 2009 18:18:01 -0400
parents 7ff36dc9f0b1
children beea83224890
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
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
14 o 6:0d34157f0c2f
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 | |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
17 | o 5:b1437926634f
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 | |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
20 o | 4:3f6a069667a2
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 | |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
23 | o 3:6c4eac9a38c2
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 | |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
26 o | 2:26171fc4359c
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 |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
29 o 1:eda61aa1eb80
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 |
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
32 o 0:984734388051
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)
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
55 diff -r 3f6a069667a2 -r 0d34157f0c2f 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)
48
1cf21a8c274b Adapt to upstream changes in pyfastimport.
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
62 diff -r b1437926634f -r 0d34157f0c2f 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