Drew McCormack e0a98a6a9e Merge branch 'master' into baselining ...

Conflicts:
	Framework/Source/Events/CDEEventIntegrator.h
	Framework/Source/Events/CDEEventIntegrator.m
	Framework/Source/General/CDEDefines.h

2014-01-29 14:50:00 +01:00

..

CDEEventBuilder.h

Added a check in the event integrator to make sure the resulting merge event is unique. If it isn’t, it gets deleted.

2013-12-16 19:56:39 +01:00

CDEEventBuilder.m

Changes related to the lastMergeRevision and baselines, including some new unit tests.

2014-01-24 10:43:13 +01:00

CDEEventIntegrator.h

Merge branch 'master' into baselining

2014-01-29 14:50:00 +01:00

CDEEventIntegrator.m

Merge branch 'master' into baselining

2014-01-29 14:50:00 +01:00

CDEEventMigrator.h

Changed file naming convention for baselines. The previous approach didn’t guarantee uniqueness, so two baselines could happen to have the same revision and name, causing file transfer to not occur properly. We now use unique id + global count to get a unique baseline state for files.

2014-01-28 13:15:35 +01:00

CDEEventMigrator.m

Changed file naming convention for baselines. The previous approach didn’t guarantee uniqueness, so two baselines could happen to have the same revision and name, causing file transfer to not occur properly. We now use unique id + global count to get a unique baseline state for files.

2014-01-28 13:15:35 +01:00

CDEEventStore.h

Updated revision accounting to take heed of baselines.

2014-01-23 17:48:16 +01:00

CDEEventStore.m

Incorporated the whole rebasing algorithm. Unit tests pass, but no baselining system tests exist yet.

2014-01-27 11:59:23 +01:00

CDEPropertyChangeValue.h

Fixed the property change value relationship merge method. It was not properly accounting for removals.

2014-01-17 12:28:12 +01:00

CDEPropertyChangeValue.m

Fixed ordering of ordered relationships in rebasing. Now it should give the same order as integrating from individual events.

2014-01-22 16:52:54 +01:00

CDESaveMonitor.h

Updated the attributes of many properties to be more explicit.

2013-11-09 11:45:09 +01:00

CDESaveMonitor.m

Merge branch 'master' into baselining

2014-01-29 10:32:20 +01:00