Mercurial > hg > hg-fastimport
diff tests/test-fastimport-anonbranch.out @ 64:beea83224890
Update tests: changeset IDs changed in 76bd0ea8add3.
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sun, 26 Jul 2015 14:25:46 -0400 |
| parents | 1cf21a8c274b |
| children |
line wrap: on
line diff
--- a/tests/test-fastimport-anonbranch.out Sun Dec 11 17:44:03 2011 +0100 +++ b/tests/test-fastimport-anonbranch.out Sun Jul 26 14:25:46 2015 -0400 @@ -11,25 +11,25 @@ 0 merge Removing blob dir 'HGTMP/test-fastimport-anonbranch/anonbranch/.hg/blobs' ... % log -o 6:0d34157f0c2f +o 6:ca2d9acb975f |\ merge | | -| o 5:b1437926634f +| o 5:426c5bd79694 | | modify foo | | -o | 4:3f6a069667a2 +o | 4:32f018ede0f8 | | remove oog | | -| o 3:6c4eac9a38c2 +| o 3:7c78b201cf49 | | modify bla | | -o | 2:26171fc4359c +o | 2:b4dd3ea3dee1 |/ add oog | -o 1:eda61aa1eb80 +o 1:60da203876bc | modify foo, add bla | -o 0:984734388051 +o 0:2eab317db71a initial revision % manifest at rev 0 @@ -52,14 +52,14 @@ % contents of bla at rev 6 blah blah % diff merge with first parent (rev 4:6) -diff -r 3f6a069667a2 -r 0d34157f0c2f bla +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 b1437926634f -r 0d34157f0c2f foo +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 @@