| questions.c (302408) | questions.c (362181) |
|---|---|
| 1/* 2 * questions.c: routines for asking questions about working copies 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 461 unchanged lines hidden (view full) --- 470 { 471 *ignore_move_edit_p = FALSE; 472 if (tree_conflicted_p && *tree_conflicted_p) 473 { 474 svn_wc_conflict_reason_t reason; 475 svn_wc_conflict_action_t action; 476 477 SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, | 1/* 2 * questions.c: routines for asking questions about working copies 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 461 unchanged lines hidden (view full) --- 470 { 471 *ignore_move_edit_p = FALSE; 472 if (tree_conflicted_p && *tree_conflicted_p) 473 { 474 svn_wc_conflict_reason_t reason; 475 svn_wc_conflict_action_t action; 476 477 SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, |
| 478 db, local_abspath, | 478 NULL, db, local_abspath, |
| 479 conflicts, 480 scratch_pool, 481 scratch_pool)); 482 483 if (reason == svn_wc_conflict_reason_moved_away 484 && action == svn_wc_conflict_action_edit) 485 { 486 *tree_conflicted_p = FALSE; --- 260 unchanged lines hidden --- | 479 conflicts, 480 scratch_pool, 481 scratch_pool)); 482 483 if (reason == svn_wc_conflict_reason_moved_away 484 && action == svn_wc_conflict_action_edit) 485 { 486 *tree_conflicted_p = FALSE; --- 260 unchanged lines hidden --- |