equal
deleted
inserted
replaced
72 v2records = self._readrecordsv2() |
72 v2records = self._readrecordsv2() |
73 allv2 = set(v2records) |
73 allv2 = set(v2records) |
74 for rev in v1records: |
74 for rev in v1records: |
75 if rev not in allv2: |
75 if rev not in allv2: |
76 # v1 file is newer than v2 file, use it |
76 # v1 file is newer than v2 file, use it |
|
77 # we have to infer the "other" changeset of the merge |
|
78 # we cannot do better than that with v1 of the format |
|
79 mctx = self._repo[None].parents()[-1] |
|
80 v1records.append(('O', mctx.hex())) |
77 return v1records |
81 return v1records |
78 else: |
82 else: |
79 return v2records |
83 return v2records |
80 def _readrecordsv1(self): |
84 def _readrecordsv1(self): |
81 records = [] |
85 records = [] |