All pastes #395398 Raw Edit

Unnamed

public text v1 · immutable
·published 2007-03-15 00:22 UTC
rendered paste body
Merging item: c7eed3a6-d288-11db-dd21-0016cb8d80a3
   rsInternal: RecordSet(set([ItemRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'TEST FOR LAST MOD', u'100 -1173917084.93 1', Decimal("1173917084")), NoteRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'THE BODY', None, None), MailMessageRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'<20070315000459.1117.76657@brian-kirschs-computer.local>', None, u'OSAF Demo Account <demo3@osafoundation.org>', None, None, None, u'OSAF Demo Account <demo3@osafoundation.org>', u'Wed, 14 Mar 2007 14:05:01 -1000', None, None), ModifiedByRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]), set([]))

   internalDiff: RecordSet(set([ItemRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'TEST FOR LAST MOD', u'100 -1173917084.93 1', Decimal("1173917084")), NoteRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'THE BODY', None, None), MailMessageRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'<20070315000459.1117.76657@brian-kirschs-computer.local>', None, u'OSAF Demo Account <demo3@osafoundation.org>', None, None, None, u'OSAF Demo Account <demo3@osafoundation.org>', u'Wed, 14 Mar 2007 14:05:01 -1000', None, None), ModifiedByRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]), set([]))

   externalDiff: RecordSet(set([ItemRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'TEST FOR LAST MOD', NoChange, Decimal("1173917084")), ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917099")), MailMessageRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', NoChange, NoChange, u'OSAF Demo Account <demo3@osafoundation.org>', None, NoChange, None, NoChange, NoChange, NoChange, NoChange), NoteRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'THE BODY', None, None)]), set([]))

   old agreed: RecordSet(set([]), set([]))

   old pending: RecordSet(set([]), set([]))

   ncd: RecordSet(set([ItemRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'TEST FOR LAST MOD', u'100 -1173917084.93 1', Decimal("1173917084")), ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917099")), NoteRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'THE BODY', None, None), MailMessageRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'<20070315000459.1117.76657@brian-kirschs-computer.local>', None, u'OSAF Demo Account <demo3@osafoundation.org>', None, None, None, u'OSAF Demo Account <demo3@osafoundation.org>', u'Wed, 14 Mar 2007 14:05:01 -1000', None, None), ModifiedByRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]), set([]))

- - - - Results - - - -

   dSend: RecordSet(set([ItemRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', NoChange, u'100 -1173917084.93 1', NoChange), MailMessageRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'<20070315000459.1117.76657@brian-kirschs-computer.local>', None, NoChange, NoChange, None, NoChange, u'OSAF Demo Account <demo3@osafoundation.org>', u'Wed, 14 Mar 2007 14:05:01 -1000', None, None), ModifiedByRecord('c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]), set([]))

   dApply: RecordSet(set([ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917099"))]), set([]))

   new agreed: RecordSet(set([ItemRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'TEST FOR LAST MOD', u'100 -1173917084.93 1', Decimal("1173917084")), ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917099")), NoteRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'THE BODY', None, None), MailMessageRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'<20070315000459.1117.76657@brian-kirschs-computer.local>', None, u'OSAF Demo Account <demo3@osafoundation.org>', None, None, None, u'OSAF Demo Account <demo3@osafoundation.org>', u'Wed, 14 Mar 2007 14:05:01 -1000', None, None), ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]), set([]))

   new pending: RecordSet(set([]), set([ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917103"))]))
----------- End of merge
Applying: c7eed3a6-d288-11db-dd21-0016cb8d80a3 RecordSet(set([ModifiedByRecord(u'c7eed3a6-d288-11db-dd21-0016cb8d80a3', u'', Decimal("1173917099"))]), set([]))