diff tests/test-double-merge.out @ 10490:f2618cacb485 stable

filelog: sort meta entries, ensure deterministic order

--- a/tests/test-double-merge.out	Tue Feb 16 23:28:46 2010 +0100
+++ b/tests/test-double-merge.out	Tue Feb 16 21:04:04 2010 +0100
@@ -1,5 +1,5 @@
 created new head
-changeset:   1:7731dad1c2b9
+changeset:   1:d9da848d0adf
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     cp foo bar; change both
@@ -12,7 +12,7 @@
   checking for directory renames
 resolving manifests
  overwrite None partial False
- ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
+ ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf
  foo: versions differ -> m
  foo: remote copied to bar -> m
 preserving foo for resolve of bar
@@ -20,12 +20,12 @@
 update: foo 1/2 files (50.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging foo and bar to bar
-my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da
+my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da
  premerge successful
 update: foo 2/2 files (100.00%)
 picked tool 'internal:merge' for foo (binary False symlink False)
 merging foo
-my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da
+my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)