| status.c (302408) | status.c (362181) |
|---|---|
| 1/* 2 * status.c: the command-line's portion of the "svn status" command 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 --- 268 unchanged lines hidden (view full) --- 277 { 278 text_conflicted = FALSE; 279 prop_conflicted = FALSE; 280 tree_conflicted = TRUE; 281 } 282 283 if (tree_conflicted) 284 { | 1/* 2 * status.c: the command-line's portion of the "svn status" command 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 --- 268 unchanged lines hidden (view full) --- 277 { 278 text_conflicted = FALSE; 279 prop_conflicted = FALSE; 280 tree_conflicted = TRUE; 281 } 282 283 if (tree_conflicted) 284 { |
| 285 const svn_wc_conflict_description2_t *tree_conflict; 286 SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx, 287 local_abspath, pool, pool)); 288 SVN_ERR_ASSERT(tree_conflict != NULL); | 285 svn_client_conflict_t *tree_conflict; |
| 289 | 286 |
| 287 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, 288 ctx, pool, pool)); |
|
| 290 tree_status_code = 'C'; 291 SVN_ERR(svn_cl__get_human_readable_tree_conflict_description( 292 &desc, tree_conflict, pool)); 293 tree_desc_line = apr_psprintf(pool, "\n > %s", desc); 294 (*tree_conflicts)++; 295 } 296 else if (text_conflicted) 297 (*text_conflicts)++; --- 331 unchanged lines hidden --- | 289 tree_status_code = 'C'; 290 SVN_ERR(svn_cl__get_human_readable_tree_conflict_description( 291 &desc, tree_conflict, pool)); 292 tree_desc_line = apr_psprintf(pool, "\n > %s", desc); 293 (*tree_conflicts)++; 294 } 295 else if (text_conflicted) 296 (*text_conflicts)++; --- 331 unchanged lines hidden --- |