1 Modified:

     2 File,Repository UID,Repository name,Key UID,Key name,Changed value,Old value,New value

     3 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000001,Setting 1,type,int,real

     4 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000002,Setting 2,backup,True,False

     5 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000003,Setting 3,cap_wr,AlwaysFail,None

     6 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000003,Setting 3,read_only,True,False

     7 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000004,Setting 4,cap_wr,None,AlwaysFail

     8 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000004,Setting 4,read_only,False,True

     9 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000007,Setting 7,ref,SimpleKeys.Setting7,SimpleKeys.Setting7RefChanged

    10 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000008,Setting 8,cap_rd,ReadDeviceData,ReadUserData

    11 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000008,Setting 8,cap_wr,WriteDeviceData,WriteUserData

    12 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000008,Setting 8,sid_rd,0xAABBCCDD,0x11223344

    13 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000008,Setting 8,sid_wr,0xDDCCBBAA,0x44332211

    14 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000009,Setting 9,cap_rd,ReadDeviceData,None

    15 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000009,Setting 9,cap_wr,WriteDeviceData,None

    16 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000009,Setting 9,sid_rd,0xAABBCCDD,None

    17 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x00000009,Setting 9,sid_wr,0xDDCCBBAA,None

    18 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001,Bitmask 1 (name changed),cap_rd,ReadDeviceData,ReadUserData

    19 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001,Bitmask 1 (name changed),cap_wr,WriteDeviceData,WriteUserData

    20 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001,Bitmask 1 (name changed),sid_rd,0xAABBCCDD,0x11223344

    21 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001,Bitmask 1 (name changed),sid_wr,0xDDCCBBAA,0x44332211

    22 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001,Bitmask 1 (name changed),type,int,binary

    23 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001 (bit 2),Bitmask 1 (name changed),ref,BitmaskKeys.Bit2,BitmaskKeys.Bit2RefChanged

    24 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001 (bit 3),Bitmask 1 (name changed),invert,False,True

    25 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),backup,True,False

    26 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),cap_rd,ReadDeviceData,ReadUserData

    27 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),cap_wr,WriteDeviceData,WriteUserData

    28 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),first_index,1,2

    29 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),index_bits,0x00000FF0,0x00001FE0

    30 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),ref,KeyRanges.Seq1,KeyRanges.Seq1RefChanged

    31 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),sid_rd,0x11223344,0xAABBCCDD

    32 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF,Sequence 1 (name changed),sid_wr,0x44332211,0xDDCCBBAA

    33 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF (sub-key 0x00000002),Sequence 1 (name changed),ref,SubSetting2,SubSetting2RefChanged

    34 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF (sub-key 0x00000002),Sequence 1 (name changed),type,int,real

    35 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00002000-0x00002FFF,Range 2,backup,True,False

    36 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00002000-0x00002FFF,Range 2,read_only,True,False

    37 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00003000-0x00003FFF,Range 3,read_only,False,True

    38 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000001,Simple key to bitmask key,key_type,simple_key,bitmask_key

    39 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000002,Bitmask key to simple key,key_type,bitmask_key,simple_key

    40 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),backup,True,False

    41 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),cap_rd,ReadDeviceData,ReadUserData

    42 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),cap_wr,AlwaysFail,WriteUserData

    43 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),read_only,True,False

    44 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),sid_rd,0xAABBCCDD,0x11223344

    45 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),sid_wr,None,0x44332211

    46 Layer1/implml/00000004_key_type_changed.crml,0x00000004,KeyTypeChanged,0x00000003,Bitmask key to simple key (other attrs changed also [xyz]),type,int,binary

    47 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,backup,True,False

    48 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,cap_rd,ReadDeviceData,ReadUserData

    49 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,cap_wr,WriteDeviceData,WriteUserData

    50 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,rfs,True,False

    51 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,sid_rd,0x11223344,0xAABBCCDD

    52 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,sid_wr,0x44332211,0xDDCCBBAA

    53 Layer1/implml/00000005_repo_attrs_changed.crml,0x00000005,RepoAttrsChangedXyz,None,,uid_name,RepoAttrsChanged,RepoAttrsChangedXyz

    54 Layer1/implml/00000006_renamed_repo_xyz.crml,0x00000006,RenamedRepo,None,,file,Layer1/implml/00000006_renamed_repo.crml,Layer1/implml/00000006_renamed_repo_xyz.crml

    55 

    56 

    57 Added:

    58 File,Repository UID,Repository name,Key UID,Key name

    59 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x20000001,Added setting

    60 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001 (bit 5),Bitmask 1 (name changed)

    61 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x20000001,Added bitmask

    62 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF (sub-key 0x00000005),Sequence 1 (name changed)

    63 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x20001001-0x20001FFF,Added range

    64 Layer1/implml/20000001_added_repo.crml,0x20000001,AddedRepo,None,

    65 

    66 

    67 Removed:

    68 File,Repository UID,Repository name,Key UID,Key name

    69 Layer1/implml/00000001_simple_keys.crml,0x00000001,SimpleKeys,0x10000001,Removed setting

    70 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x00000001 (bit 4),Bitmask 1

    71 Layer1/implml/00000002_bitmask_keys.crml,0x00000002,BitmaskKeys,0x10000001,Removed bitmask

    72 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x00001001-0x00001FFF (sub-key 0x00000004),Sequence 1

    73 Layer1/implml/00000003_key_ranges.crml,0x00000003,KeyRanges,0x10001001-0x10001FFF,Removed range

    74 Layer1/implml/10000001_removed_repo.crml,0x10000001,RemovedRepo,None,

    75 

    76 

    77 Duplicate repositories in source:

    78 File,Repository UID

    79 Layer1/implml/30000000_duplicate_repo1_proj1.crml

    80 Layer1/implml/30000000_duplicate_repo2_proj1.crml

    81 

    82 

    83 Duplicate repositories in target:

    84 File,Repository UID

    85 Layer1/implml/30000000_duplicate_repo1_proj2.crml

    86 Layer1/implml/30000000_duplicate_repo2_proj2.crml