| CODENOTIFIER | HelpYou are not signed inSign in |
Project: Subversion
Revision: 32926
Author: julianfoad
Date: 05 Sep 2008 10:12:53
Changes:Tweak a comment. (It appears in 3 places.)
* subversion/libsvn_fs_base/notes/structure
In the algorithm step about a "double delete", also include
delete-versus-modify scenarios.
* subversion/libsvn_fs_base/tree.c,
subversion/libsvn_fs_fs/tree.c
(merge): In the comment about a "double delete", also include
delete-versus-modify scenarios.
| ...... | @@ -2147,7 +2147,8 @@ | |
| 2147 | 2147 | apr_int64_t sub_mergeinfo_increment; |
| 2148 | 2148 | |
| 2149 | 2149 | /* If SOURCE-ENTRY and TARGET-ENTRY are both null, that's a |
| 2150 | double delete; flag a conflict. */ | |
| 2150 | double delete; if one of them is null, that's a delete versus | |
| 2151 | a modification. In any of these cases, flag a conflict. */ | |
| 2151 | 2152 | if (s_entry == NULL || t_entry == NULL) |
| 2152 | 2153 | return conflict_err(conflict_p, |
| 2153 | 2154 | svn_path_join(target_path, |
| ...... | @@ -682,7 +682,8 @@ | |
| 682 | 682 | must be merged or declared to be in conflict. |
| 683 | 683 | |
| 684 | 684 | If SOURCE-ENTRY and TARGET-ENTRY are both null, that's a |
| 685 | double delete; flag a conflict. | |
| 685 | double delete; if one of them is null, that's a delete versus | |
| 686 | a modification. In any of these cases, flag a conflict. | |
| 686 | 687 | |
| 687 | 688 | If any of the three entries is of type file, declare a conflict. |
| 688 | 689 |
| ...... | @@ -1452,7 +1452,8 @@ | |
| 1452 | 1452 | apr_int64_t sub_mergeinfo_increment; |
| 1453 | 1453 | |
| 1454 | 1454 | /* If SOURCE-ENTRY and TARGET-ENTRY are both null, that's a |
| 1455 | double delete; flag a conflict. */ | |
| 1455 | double delete; if one of them is null, that's a delete versus | |
| 1456 | a modification. In any of these cases, flag a conflict. */ | |
| 1456 | 1457 | if (s_entry == NULL || t_entry == NULL) |
| 1457 | 1458 | return conflict_err(conflict_p, |
| 1458 | 1459 | svn_path_join(target_path, |