← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/tests/cmdline/merge_automatic_tests.py

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-05-20 22:45:32 UTC
  • mfrom: (0.2.12)
  • Revision ID: package-import@ubuntu.com-20140520224532-4fec3gohdzyy692g
Tags: 1.8.9-1
* New upstream release
* Merge changes from Ubuntu:
  - Add DEB-8 test for Apache functionality
  - debian/rules: Create pot file on build.
  - debian/rules: Ensure the doxygen output directory exists
  - Move svn2cl to subversion-tools' Suggests on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/tests/cmdline/merge_automatic_tests.py
1202
1202
  svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
1203
1203
                                     sbox.repo_url + '/branch', A_path)
1204
1204
 
 
1205
@Issue(4481)
 
1206
def reintegrate_subtree_not_updated(sbox):
 
1207
  "reintegrate subtree not updated"
 
1208
 
 
1209
  sbox.build()
 
1210
 
 
1211
  # Create change on branch 'D_1'
 
1212
  sbox.simple_copy('A/D', 'D_1')
 
1213
  sbox.simple_commit()
 
1214
  sbox.simple_append('D_1/G/pi', "D_1/G pi edit\n")
 
1215
  sbox.simple_append('D_1/H/chi', "D_1/H chi edit\n")
 
1216
  sbox.simple_commit()
 
1217
 
 
1218
  # Merge back to 'D' with two subtree merges
 
1219
  expected_output = [
 
1220
    "--- Merging r2 through r3 into '"
 
1221
    + sbox.ospath('A/D/G') + "':\n",
 
1222
    "U    "
 
1223
    + sbox.ospath('A/D/G/pi') + "\n",
 
1224
    "--- Recording mergeinfo for merge of r2 through r3 into '"
 
1225
    + sbox.ospath('A/D/G') + "':\n",
 
1226
    " U   "
 
1227
    + sbox.ospath('A/D/G') + "\n"]
 
1228
  svntest.actions.run_and_verify_svn(None, expected_output, [],
 
1229
                                     'merge',
 
1230
                                     sbox.repo_url + '/D_1/G',
 
1231
                                     sbox.ospath('A/D/G'))
 
1232
  expected_output = [
 
1233
    "--- Merging r2 through r3 into '"
 
1234
    + sbox.ospath('A/D/H') + "':\n",
 
1235
    "U    "
 
1236
    + sbox.ospath('A/D/H/chi') + "\n",
 
1237
    "--- Recording mergeinfo for merge of r2 through r3 into '"
 
1238
    + sbox.ospath('A/D/H') + "':\n",
 
1239
    " U   "
 
1240
    + sbox.ospath('A/D/H') + "\n"]
 
1241
  svntest.actions.run_and_verify_svn(None, expected_output, [],
 
1242
                                     'merge',
 
1243
                                     sbox.repo_url + '/D_1/H',
 
1244
                                     sbox.ospath('A/D/H'))
 
1245
  sbox.simple_commit()
 
1246
  sbox.simple_update()
 
1247
 
 
1248
  # Create branch 'D_2'
 
1249
  sbox.simple_copy('A/D', 'D_2')
 
1250
  sbox.simple_commit()
 
1251
  sbox.simple_update()
 
1252
 
 
1253
  # Create change on 'D_2'
 
1254
  sbox.simple_append('D_2/G/pi', "D_2/G pi edit\n")
 
1255
  sbox.simple_commit()
 
1256
  sbox.simple_update()
 
1257
 
 
1258
  # Create change on 'D'
 
1259
  sbox.simple_append('A/D/G/rho', "D/G rho edit\n")
 
1260
  sbox.simple_commit()
 
1261
  sbox.simple_update()
 
1262
 
 
1263
  # Sync merge to 'D_2' (doesn't record mergeinfo on 'D_2/H' subtree)
 
1264
  expected_output = [
 
1265
    "--- Merging r5 through r7 into '"
 
1266
    + sbox.ospath('D_2') + "':\n",
 
1267
    "U    "
 
1268
    + sbox.ospath('D_2/G/rho') + "\n",
 
1269
    "--- Recording mergeinfo for merge of r5 through r7 into '"
 
1270
    + sbox.ospath('D_2') + "':\n",
 
1271
    " U   "
 
1272
    + sbox.ospath('D_2') + "\n",
 
1273
    "--- Recording mergeinfo for merge of r5 through r7 into '"
 
1274
    + sbox.ospath('D_2/G') + "':\n",
 
1275
    " U   "
 
1276
    + sbox.ospath('D_2/G') + "\n"]
 
1277
  svntest.actions.run_and_verify_svn(None, expected_output, [],
 
1278
                                     'merge',
 
1279
                                     sbox.repo_url + '/A/D',
 
1280
                                     sbox.ospath('D_2'))
 
1281
  sbox.simple_commit()
 
1282
  sbox.simple_update()
 
1283
 
 
1284
  # Reintegrate 'D_2' to 'D'
 
1285
  expected_output = [
 
1286
    "--- Merging differences between repository URLs into '"
 
1287
    + sbox.ospath('A/D') + "':\n",
 
1288
    "U    "
 
1289
    + sbox.ospath('A/D/G/pi') + "\n",
 
1290
    " U   "
 
1291
    + sbox.ospath('A/D/G') + "\n",
 
1292
    "--- Recording mergeinfo for merge between repository URLs into '"
 
1293
    + sbox.ospath('A/D') + "':\n",
 
1294
    " U   "
 
1295
    + sbox.ospath('A/D') + "\n",
 
1296
    " U   "
 
1297
    + sbox.ospath('A/D/G') + "\n"]
 
1298
  svntest.actions.run_and_verify_svn(None, expected_output, [],
 
1299
                                     'merge',
 
1300
                                     sbox.repo_url + '/D_2',
 
1301
                                     sbox.ospath('A/D'))
 
1302
  sbox.simple_commit()
 
1303
  sbox.simple_update()
 
1304
 
 
1305
  # merge to 'D_2'. This merge previously failed with this error:
 
1306
  #
 
1307
  # svn: E195016: Reintegrate can only be used if revisions 5 through 9 were
 
1308
  # previously merged from [URL]/D_2 to the reintegrate source, but this is
 
1309
  # not the case:
 
1310
  #   A/D/G
 
1311
  #       Missing ranges: /A/D/G:7
 
1312
  #
 
1313
  expected_output = [
 
1314
    "--- Merging differences between repository URLs into '"
 
1315
    + sbox.ospath('D_2') + "':\n",
 
1316
    " U   "
 
1317
    + sbox.ospath('D_2/G') + "\n",
 
1318
    "--- Recording mergeinfo for merge between repository URLs into '"
 
1319
    + sbox.ospath('D_2') + "':\n",
 
1320
    " U   "
 
1321
    + sbox.ospath('D_2') + "\n",
 
1322
    " G   "
 
1323
    + sbox.ospath('D_2/G') + "\n"]
 
1324
  svntest.actions.run_and_verify_svn(None, expected_output, [],
 
1325
                                     'merge',
 
1326
                                     sbox.repo_url + '/A/D',
 
1327
                                     sbox.ospath('D_2'))
 
1328
  sbox.simple_commit()
 
1329
  sbox.simple_update()
 
1330
 
1205
1331
########################################################################
1206
1332
# Run the tests
1207
1333
 
1230
1356
              merge_replacement,
1231
1357
              auto_merge_handles_replacements_in_merge_source,
1232
1358
              effective_sync_results_in_reintegrate,
 
1359
              reintegrate_subtree_not_updated,
1233
1360
             ]
1234
1361
 
1235
1362
if __name__ == '__main__':