Mercurial > hg
diff tests/test-issue672.out @ 10490:f2618cacb485 stable
filelog: sort meta entries, ensure deterministic order
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
---|---|
date | Tue, 16 Feb 2010 21:04:04 +0100 |
parents | ba5e508b5e92 |
children | db426935fa94 |
line wrap: on
line diff
--- a/tests/test-issue672.out Tue Feb 16 23:28:46 2010 +0100 +++ b/tests/test-issue672.out Tue Feb 16 21:04:04 2010 +0100 @@ -10,7 +10,7 @@ checking for directory renames resolving manifests overwrite None partial False - ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c + ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a 1: other deleted -> r 1a: remote created -> g update: 1 1/2 files (50.00%) @@ -30,13 +30,13 @@ checking for directory renames resolving manifests overwrite None partial False - ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 + ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 1a: local copied/moved to 1 -> m preserving 1a for resolve of 1a update: 1a 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False) merging 1a and 1 to 1a -my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d +my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d premerge successful 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -49,14 +49,14 @@ checking for directory renames resolving manifests overwrite None partial False - ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 + ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 1: remote moved to 1a -> m preserving 1 for resolve of 1a removing 1 update: 1 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False) merging 1 and 1a to 1a -my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d +my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d premerge successful 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)