% import
scanning source...
sorting...
converting...
6 initial revision
5 modify foo, add bla
4 add oog
3 modify bla
2 remove oog
1 modify foo
0 merge
Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ...
% log
o    6:ca2d9acb975f
|\   merge
| |
| o  5:426c5bd79694
| |  modify foo
| |
o |  4:32f018ede0f8
| |  remove oog
| |
| o  3:7c78b201cf49
| |  modify bla
| |
o |  2:b4dd3ea3dee1
|/   add oog
|
o  1:60da203876bc
|  modify foo, add bla
|
o  0:2eab317db71a
   initial revision

% manifest at rev 0
bar
foo
% manifest at rev 6
bar
bla
foo
% contents of foo at rev 3
oof
% contents of bla at rev 3
blah blah
% contents of foo at rev 5
foo foo
% contents of foo at rev 6
oof
% contents of bar at rev 6
bar
% contents of bla at rev 6
blah blah
% diff merge with first parent (rev 4:6)
diff -r 32f018ede0f8 -r ca2d9acb975f bla
--- a/bla	Thu Jan 10 21:23:00 2008 +0000
+++ b/bla	Thu Jan 10 21:24:00 2008 +0000
@@ -1,1 +1,1 @@
-bla
+blah blah
% diff merge with second parent (rev 5:6)
diff -r 426c5bd79694 -r ca2d9acb975f foo
--- a/foo	Thu Jan 10 21:23:30 2008 +0000
+++ b/foo	Thu Jan 10 21:24:00 2008 +0000
@@ -1,1 +1,1 @@
-foo foo
+oof