Mercurial > hg > hg-fastimport

comparison 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
comparison
equal deleted inserted replaced
47:7ff36dc9f0b1 48:1cf21a8c274b
9 2 remove oog 9 2 remove oog
10 1 modify foo 10 1 modify foo
11 0 merge 11 0 merge
12 Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ... 12 Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ...
13 % log 13 % log
14 o 6:ca2d9acb975f 14 o 6:0d34157f0c2f
15 |\ merge 15 |\ merge
16 | | 16 | |
17 | o 5:426c5bd79694 17 | o 5:b1437926634f
18 | | modify foo 18 | | modify foo
19 | | 19 | |
20 o | 4:32f018ede0f8 20 o | 4:3f6a069667a2
21 | | remove oog 21 | | remove oog
22 | | 22 | |
23 | o 3:7c78b201cf49 23 | o 3:6c4eac9a38c2
24 | | modify bla 24 | | modify bla
25 | | 25 | |
26 o | 2:b4dd3ea3dee1 26 o | 2:26171fc4359c
27 |/ add oog 27 |/ add oog
28 | 28 |
29 o 1:60da203876bc 29 o 1:eda61aa1eb80
30 | modify foo, add bla 30 | modify foo, add bla
31 | 31 |
32 o 0:2eab317db71a 32 o 0:984734388051
33 initial revision 33 initial revision
34 34
35 % manifest at rev 0 35 % manifest at rev 0
36 bar 36 bar
37 foo 37 foo
50 % contents of bar at rev 6 50 % contents of bar at rev 6
51 bar 51 bar
52 % contents of bla at rev 6 52 % contents of bla at rev 6
53 blah blah 53 blah blah
54 % diff merge with first parent (rev 4:6) 54 % diff merge with first parent (rev 4:6)
55 diff -r 32f018ede0f8 -r ca2d9acb975f bla 55 diff -r 3f6a069667a2 -r 0d34157f0c2f bla
56 --- a/bla Thu Jan 10 21:23:00 2008 +0000 56 --- a/bla Thu Jan 10 21:23:00 2008 +0000
57 +++ b/bla Thu Jan 10 21:24:00 2008 +0000 57 +++ b/bla Thu Jan 10 21:24:00 2008 +0000
58 @@ -1,1 +1,1 @@ 58 @@ -1,1 +1,1 @@
59 -bla 59 -bla
60 +blah blah 60 +blah blah
61 % diff merge with second parent (rev 5:6) 61 % diff merge with second parent (rev 5:6)
62 diff -r 426c5bd79694 -r ca2d9acb975f foo 62 diff -r b1437926634f -r 0d34157f0c2f foo
63 --- a/foo Thu Jan 10 21:23:30 2008 +0000 63 --- a/foo Thu Jan 10 21:23:30 2008 +0000
64 +++ b/foo Thu Jan 10 21:24:00 2008 +0000 64 +++ b/foo Thu Jan 10 21:24:00 2008 +0000
65 @@ -1,1 +1,1 @@ 65 @@ -1,1 +1,1 @@
66 -foo foo 66 -foo foo
67 +oof 67 +oof