Mercurial > hg > hg-fastimport
view tests/test-fastimport-anonbranch.out @ 48:1cf21a8c274b
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 |
line wrap: on
line source
% 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:0d34157f0c2f |\ merge | | | o 5:b1437926634f | | modify foo | | o | 4:3f6a069667a2 | | remove oog | | | o 3:6c4eac9a38c2 | | modify bla | | o | 2:26171fc4359c |/ add oog | o 1:eda61aa1eb80 | modify foo, add bla | o 0:984734388051 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 3f6a069667a2 -r 0d34157f0c2f 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 b1437926634f -r 0d34157f0c2f 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