45,46d44
<   testFailIfCorrespondingNodeIsSuccessor(org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest)
<   testFailIfCorrespondingNodeIsSuccessorJcr2(org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest)
80,81d77
<   testLeaveIfCorrespondingNodeIsPredeccessor(org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest)
<   testLeaveIfCorrespondingNodeIsPredeccessorJcr2(org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest)
92,111d87
<   testMergeNodeBestEffortFalse(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeBestEffortFalseAmbiguousVersions(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeBestEffortFalseAmbiguousVersionsJcr2(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeBestEffortFalseJcr2(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeBestEffortTrueCheckMergeFailedProperty(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeBestEffortTrueCheckMergeFailedPropertyJcr2(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeCancelMerge(org.apache.jackrabbit.test.api.version.MergeCancelMergeTest)
<   testMergeNodeCancelMergeJcr2(org.apache.jackrabbit.test.api.version.MergeCancelMergeTest)
<   testMergeNodeDoneMerge(org.apache.jackrabbit.test.api.version.MergeDoneMergeTest)
<   testMergeNodeDoneMergeJcr2(org.apache.jackrabbit.test.api.version.MergeDoneMergeTest)
<   testMergeNodeFromOlderSourceWorkspace(org.apache.jackrabbit.test.api.version.MergeSubNodeTest)
<   testMergeNodeFromOlderSourceWorkspaceJcr2(org.apache.jackrabbit.test.api.version.MergeSubNodeTest)
<   testMergeNodeNonCorrespondingNode(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeNonCorrespondingNodeJcr2(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeNonVersionableSubNodeNonVersionableAncestor(org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest)
<   testMergeNodeNonVersionableSubNodeNonVersionableAncestorJcr2(org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest)
<   testMergeNodeVersionAmbiguous(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeNodeVersionAmbiguousJcr2(org.apache.jackrabbit.test.api.version.MergeNodeTest)
<   testMergeRecursive(org.apache.jackrabbit.test.api.version.MergeShallowTest)
<   testMergeShallow(org.apache.jackrabbit.test.api.version.MergeShallowTest)
118,119d93
<   testNodeIterator(org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest)
<   testNodeIteratorJcr2(org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest)
134d107
<   testRestoreChild1(org.apache.jackrabbit.test.api.version.RestoreTest)
136d108
<   testRestoreChild1Jcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
138d109
<   testRestoreChild1Jcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
140d110
<   testRestoreChild1Jcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
142d111
<   testRestoreChild1Jcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
145d113
<   testRestoreCorrectProperty(org.apache.jackrabbit.test.api.version.RestoreTest)
147d114
<   testRestoreCorrectPropertyJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
149d115
<   testRestoreCorrectPropertyJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
151d116
<   testRestoreCorrectPropertyJcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
153d117
<   testRestoreCorrectPropertyJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
159d122
<   testRestoreLabel(org.apache.jackrabbit.test.api.version.RestoreTest)
161d123
<   testRestoreLabelJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
163d124
<   testRestoreName(org.apache.jackrabbit.test.api.version.RestoreTest)
165d125
<   testRestoreNameJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
172d131
<   testRestoreOnCheckedInNode(org.apache.jackrabbit.test.api.version.RestoreTest)
174d132
<   testRestoreOnCheckedInNodeJcr2_1(org.apache.jackrabbit.test.api.version.RestoreTest)
176d133
<   testRestoreOnCheckedInNodeJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
178d134
<   testRestoreOnCheckedInNodeJcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
180d135
<   testRestoreOnCheckedInNodeJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
182d136
<   testRestoreOnCheckedOutNode(org.apache.jackrabbit.test.api.version.RestoreTest)
184d137
<   testRestoreOnCheckedOutNodeJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
186d138
<   testRestoreOnCheckedOutNodeJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
188d139
<   testRestoreOnCheckedOutNodeJcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
190d140
<   testRestoreOnCheckedOutNodeJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
192d141
<   testRestoreOrder(org.apache.jackrabbit.test.api.version.RestoreTest)
194d142
<   testRestoreOrder2(org.apache.jackrabbit.test.api.version.RestoreTest)
196d143
<   testRestoreOrder2Jcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
198d144
<   testRestoreOrder2Jcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
200d145
<   testRestoreOrder2Jcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
202d146
<   testRestoreOrder2Jcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
204d147
<   testRestoreOrderJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
206d148
<   testRestoreOrderJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
208d149
<   testRestoreOrderJcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
210d150
<   testRestoreOrderJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
213,214d152
<   testRestoreRemoved(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreRemovedJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
216d153
<   testRestoreRootVersionFailJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
218,223d154
<   testRestoreSetsBaseVersion(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreSetsBaseVersionJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreSetsBaseVersionJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreSetsBaseVersionJcr2_3(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreSetsBaseVersionJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
<   testRestoreSetsIsCheckedOutToFalse(org.apache.jackrabbit.test.api.version.RestoreTest)
225d155
<   testRestoreSetsIsCheckedOutToFalseJcr2(org.apache.jackrabbit.test.api.version.RestoreTest)
227d156
<   testRestoreSetsIsCheckedOutToFalseJcr2_2(org.apache.jackrabbit.test.api.version.RestoreTest)
229d157
<   testRestoreSetsIsCheckedOutToFalseJcr2_4(org.apache.jackrabbit.test.api.version.RestoreTest)
231d158
<   testRestoreSetsIsCheckedOutToFalseJcr3(org.apache.jackrabbit.test.api.version.RestoreTest)
257,262d183
<   testWorkspaceRestoreOnCheckedInNode(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)
<   testWorkspaceRestoreOnCheckedInNodeJcr2(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)
<   testWorkspaceRestoreOnCheckedOutNode(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)
<   testWorkspaceRestoreOnCheckedOutNodeJcr2(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)
<   testWorkspaceRestoreWithRemoveExisting(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)
<   testWorkspaceRestoreWithRemoveExistingJcr2(org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest)