Lines Matching refs:operation
959 * was found, store it in BATON->DELETED_REV and abort the log operation
1106 /* We're done. Abort the log operation. */
1123 svn_wc_operation_t operation;
1126 operation = svn_client_conflict_get_operation(conflict);
1131 if (operation == svn_wc_operation_update ||
1132 operation == svn_wc_operation_switch)
1135 else if (operation == svn_wc_operation_merge)
1152 if (operation == svn_wc_operation_update ||
1153 operation == svn_wc_operation_switch)
1155 else if (operation == svn_wc_operation_merge)
1193 if (operation == svn_wc_operation_update ||
1194 operation == svn_wc_operation_switch)
1223 else if (operation == svn_wc_operation_merge)
1267 if (operation == svn_wc_operation_update ||
1268 operation == svn_wc_operation_switch)
1297 else if (operation == svn_wc_operation_merge)
1347 svn_wc_operation_t operation;
1350 operation = svn_client_conflict_get_operation(conflict);
1355 if (operation == svn_wc_operation_update ||
1356 operation == svn_wc_operation_switch)
1359 else if (operation == svn_wc_operation_merge)
1377 if (operation == svn_wc_operation_update ||
1378 operation == svn_wc_operation_switch)
1380 else if (operation == svn_wc_operation_merge)
1419 if (operation == svn_wc_operation_update ||
1420 operation == svn_wc_operation_switch)
1449 else if (operation == svn_wc_operation_merge)
1493 if (operation == svn_wc_operation_update ||
1494 operation == svn_wc_operation_switch)
1523 else if (operation == svn_wc_operation_merge)
2300 /* Log operation was aborted because we found deleted rev. */
2394 * of a merge operation they are part of the merge source branch.
2936 * conflict victim. This operation would obviously be quite expensive.
3110 svn_wc_operation_t operation;
3113 operation = svn_client_conflict_get_operation(conflict);
3129 if (operation == svn_wc_operation_update ||
3130 operation == svn_wc_operation_switch)
3133 else if (operation == svn_wc_operation_merge)
3331 svn_wc_operation_t operation)
3337 if (operation == svn_wc_operation_update)
3342 return _("An update operation tried to edit a file.");
3344 return _("An update operation tried to add a file.");
3346 return _("An update operation tried to delete or move "
3349 return _("An update operation tried to replace a file.");
3352 else if (operation == svn_wc_operation_switch)
3357 return _("A switch operation tried to edit a file.");
3359 return _("A switch operation tried to add a file.");
3361 return _("A switch operation tried to delete or move "
3364 return _("A switch operation tried to replace a file.");
3367 else if (operation == svn_wc_operation_merge)
3372 return _("A merge operation tried to edit a file.");
3374 return _("A merge operation tried to add a file.");
3376 return _("A merge operation tried to delete or move "
3379 return _("A merge operation tried to replace a file.");
3384 if (operation == svn_wc_operation_update)
3389 return _("An update operation tried to change a directory.");
3391 return _("An update operation tried to add a directory.");
3393 return _("An update operation tried to delete or move "
3396 return _("An update operation tried to replace a directory.");
3399 else if (operation == svn_wc_operation_switch)
3404 return _("A switch operation tried to edit a directory.");
3406 return _("A switch operation tried to add a directory.");
3408 return _("A switch operation tried to delete or move "
3411 return _("A switch operation tried to replace a directory.");
3414 else if (operation == svn_wc_operation_merge)
3419 return _("A merge operation tried to edit a directory.");
3421 return _("A merge operation tried to add a directory.");
3423 return _("A merge operation tried to delete or move "
3426 return _("A merge operation tried to replace a directory.");
3432 if (operation == svn_wc_operation_update)
3437 return _("An update operation tried to edit an item.");
3439 return _("An update operation tried to add an item.");
3441 return _("An update operation tried to delete or move "
3444 return _("An update operation tried to replace an item.");
3447 else if (operation == svn_wc_operation_switch)
3452 return _("A switch operation tried to edit an item.");
3454 return _("A switch operation tried to add an item.");
3456 return _("A switch operation tried to delete or move "
3459 return _("A switch operation tried to replace an item.");
3462 else if (operation == svn_wc_operation_merge)
3467 return _("A merge operation tried to edit an item.");
3469 return _("A merge operation tried to add an item.");
3471 return _("A merge operation tried to delete or move "
3474 return _("A merge operation tried to replace an item.");
3483 /* Return a localised string representation of the operation part of a
3486 operation_str(svn_wc_operation_t operation)
3488 switch (operation)
5097 svn_wc_operation_t operation;
5108 operation = svn_client_conflict_get_operation(conflict);
5110 if (operation == svn_wc_operation_update)
5124 /* The update operation went forward in history. */
5180 /* The update operation went backwards in history.
5189 else if (operation == svn_wc_operation_switch ||
5190 operation == svn_wc_operation_merge)
5199 /* The switch/merge operation went forward in history.
5231 /* The switch/merge operation went backwards in history.
5292 svn_wc_operation_t operation;
5303 operation = svn_client_conflict_get_operation(conflict);
5305 if (operation == svn_wc_operation_update ||
5306 operation == svn_wc_operation_switch)
5312 * The implication is that we cannot know whether the operation went
5384 else if (operation == svn_wc_operation_merge &&
5389 /* The merge operation went forwards in history.
5438 /* The merge operation was a reverse-merge.
5975 svn_wc_operation_t operation;
5992 operation = svn_client_conflict_get_operation(conflict);
5993 if (operation == svn_wc_operation_update)
6009 else if (operation == svn_wc_operation_switch ||
6010 operation == svn_wc_operation_merge)
6667 * incoming add vs add tree conflict exists after an update operation.
6668 * We assume the update operation leaves the working copy in a state which
6683 svn_wc_operation_t operation;
6699 operation = svn_client_conflict_get_operation(conflict);
6700 SVN_ERR_ASSERT(operation == svn_wc_operation_update);
6823 svn_wc_operation_t operation;
6827 operation = svn_client_conflict_get_operation(conflict);
6833 if (operation == svn_wc_operation_update)
6958 * history, which is part of the BASE tree. This revert operation
7724 * This uses a diff-tree processor because our standard merge operation
7952 /* The update/switch operation has added the incoming versioned
7955 * This meta-data-only revert operation effecively merges the
8182 svn_wc_operation_t operation,
8193 SVN_ERR_ASSERT(operation == svn_wc_operation_update ||
8194 operation == svn_wc_operation_switch);
8235 else if (operation == svn_wc_operation_update)
8257 else if (operation == svn_wc_operation_switch)
8298 svn_wc_operation_t operation;
8305 operation = svn_client_conflict_get_operation(conflict);
8308 if (operation == svn_wc_operation_update ||
8309 operation == svn_wc_operation_switch)
8336 details, operation, wcroot_abspath, conflict, ctx,
8339 else if (operation == svn_wc_operation_merge)
8490 svn_wc_operation_t operation;
8517 operation = svn_client_conflict_get_operation(conflict);
8526 if (operation == svn_wc_operation_none)
8528 _("Invalid operation code '%d' recorded for "
8529 "conflict at '%s'"), operation,
8634 if (operation == svn_wc_operation_update ||
8635 operation == svn_wc_operation_switch)
8668 * was brought in by the update/switch operation and occupies the path
8675 else if (operation == svn_wc_operation_merge)
8739 if (operation == svn_wc_operation_merge && incoming_abspath)
8764 if (operation == svn_wc_operation_update ||
8765 operation == svn_wc_operation_switch)
8796 if (err && operation == svn_wc_operation_merge && incoming_abspath)
8822 svn_wc_operation_t operation;
8849 operation = svn_client_conflict_get_operation(conflict);
8858 if (operation == svn_wc_operation_none)
8860 _("Invalid operation code '%d' recorded for "
8861 "conflict at '%s'"), operation,
9026 svn_wc_operation_t operation;
9047 operation = svn_client_conflict_get_operation(conflict);
9057 if (operation == svn_wc_operation_none)
9059 _("Invalid operation code '%d' recorded for "
9060 "conflict at '%s'"), operation,
9175 svn_wc_operation_t operation;
9195 operation = svn_client_conflict_get_operation(conflict);
9205 if (operation == svn_wc_operation_none)
9207 _("Invalid operation code '%d' recorded for "
9208 "conflict at '%s'"), operation,
9260 /* The move operation is not part of natural history. We must replicate
9333 svn_wc_operation_t operation;
9356 operation = svn_client_conflict_get_operation(conflict);
9383 if (operation == svn_wc_operation_update ||
9384 operation == svn_wc_operation_switch)
9389 else if (operation == svn_wc_operation_merge)
9418 if (!is_copy && operation == svn_wc_operation_merge)
9448 if (operation == svn_wc_operation_merge)
9463 /* The move operation is not part of natural history. We must replicate
9502 SVN_ERR_ASSERT(operation == svn_wc_operation_update ||
9503 operation == svn_wc_operation_switch);
9526 /* The move operation is part of our natural history.
10076 svn_wc_operation_t operation;
10081 operation = svn_client_conflict_get_operation(conflict);
10085 if ((operation == svn_wc_operation_update ||
10086 operation == svn_wc_operation_switch) &&
10115 svn_wc_operation_t operation;
10119 operation = svn_client_conflict_get_operation(conflict);
10123 if ((operation == svn_wc_operation_update ||
10124 operation == svn_wc_operation_switch) &&
10146 svn_wc_operation_t operation;
10151 operation = svn_client_conflict_get_operation(conflict);
10156 if ((operation == svn_wc_operation_update ||
10157 operation == svn_wc_operation_switch) &&
10181 svn_wc_operation_t operation;
10188 operation = svn_client_conflict_get_operation(conflict);
10209 if (operation == svn_wc_operation_merge)
10214 else if (operation == svn_wc_operation_update ||
10215 operation == svn_wc_operation_switch)
10236 _("unexpected operation code '%d'"),
10237 operation);
10254 svn_wc_operation_t operation;
10262 operation = svn_client_conflict_get_operation(conflict);
10285 if (operation == svn_wc_operation_merge)
10306 operation == svn_wc_operation_merge
10323 svn_wc_operation_t operation;
10331 operation = svn_client_conflict_get_operation(conflict);
10340 if (operation == svn_wc_operation_merge &&
10379 svn_wc_operation_t operation;
10387 operation = svn_client_conflict_get_operation(conflict);
10400 (operation == svn_wc_operation_merge &&
10402 (operation != svn_wc_operation_merge &&
10411 if (operation == svn_wc_operation_merge)
10436 operation == svn_wc_operation_merge
10452 svn_wc_operation_t operation;
10460 operation = svn_client_conflict_get_operation(conflict);
10469 if (operation == svn_wc_operation_merge &&
10507 svn_wc_operation_t operation;
10515 operation = svn_client_conflict_get_operation(conflict);
10524 if (operation == svn_wc_operation_merge &&
10562 svn_wc_operation_t operation;
10568 operation = svn_client_conflict_get_operation(conflict);
10604 operation == svn_wc_operation_merge)
10701 svn_wc_operation_t operation;
10712 operation = svn_client_conflict_get_operation(conflict);
10713 if (operation == svn_wc_operation_merge)
10926 svn_wc_operation_t operation;
10936 operation = svn_client_conflict_get_operation(conflict);
10948 if (operation == svn_wc_operation_merge &&
11012 svn_wc_operation_t operation;
11022 operation = svn_client_conflict_get_operation(conflict);
11034 if (operation == svn_wc_operation_merge &&
11121 svn_wc_operation_t operation;
11147 operation = svn_client_conflict_get_operation(conflict);
11156 if (operation == svn_wc_operation_none)
11158 _("Invalid operation code '%d' recorded for "
11159 "conflict at '%s'"), operation,
11331 svn_wc_operation_t operation;
11357 operation = svn_client_conflict_get_operation(conflict);
11366 if (operation == svn_wc_operation_none)
11368 _("Invalid operation code '%d' recorded for "
11369 "conflict at '%s'"), operation,
11487 * has already been deleted during the update/switch operation. */
11565 svn_wc_operation_t operation;
11567 operation = svn_client_conflict_get_operation(conflict);
11585 if (operation == svn_wc_operation_merge)
11629 svn_wc_operation_t operation;
11644 operation = svn_client_conflict_get_operation(conflict);
11646 if (operation == svn_wc_operation_merge)
11689 svn_wc_operation_t operation;
11704 operation = svn_client_conflict_get_operation(conflict);
11706 if (operation == svn_wc_operation_merge)
11737 svn_wc_operation_t operation;
11753 operation = svn_client_conflict_get_operation(conflict);
11766 /* ### what about the switch operation? */
11767 if (((operation == svn_wc_operation_merge &&
11769 (operation == svn_wc_operation_update &&
11773 ((operation == svn_wc_operation_merge &&
11775 (operation == svn_wc_operation_update &&
11791 operation == svn_wc_operation_merge ?
11801 operation == svn_wc_operation_merge ?
11816 svn_wc_operation_t operation;
11832 operation = svn_client_conflict_get_operation(conflict);
11845 if (operation == svn_wc_operation_merge &&
11951 svn_wc_operation_t operation;
11974 operation = svn_client_conflict_get_operation(conflict);
11978 if (operation == svn_wc_operation_merge &&
12097 svn_wc_operation_t operation;
12116 operation = svn_client_conflict_get_operation(conflict);
12120 if (operation == svn_wc_operation_merge &&
12210 svn_wc_operation_t operation;
12234 operation = svn_client_conflict_get_operation(conflict);
12238 if (operation == svn_wc_operation_merge &&
12288 else if ((operation == svn_wc_operation_update ||
12289 operation == svn_wc_operation_switch) &&
12379 svn_wc_operation_t operation;
12398 operation = svn_client_conflict_get_operation(conflict);
12402 if (operation == svn_wc_operation_merge &&
12475 else if ((operation == svn_wc_operation_update ||
12476 operation == svn_wc_operation_switch) &&
12959 return get_conflict_desc2_t(conflict)->operation;
13189 svn_wc_operation_t operation;
13206 operation = svn_client_conflict_get_operation(conflict);
13242 operation == svn_wc_operation_update /* ### what about switch? */)
13500 /* Run the most recent resolve operation again.