Searched refs:text_state (Results 1 – 1 of 1) sorted by relevance
2041 svn_wc_notify_state_t text_state; in merge_file_changed() local2070 text_state = svn_wc_notify_state_unchanged; in merge_file_changed()2163 text_state = svn_wc_notify_state_conflicted; in merge_file_changed()2166 text_state = svn_wc_notify_state_merged; in merge_file_changed()2168 text_state = svn_wc_notify_state_changed; in merge_file_changed()2170 text_state = svn_wc_notify_state_missing; in merge_file_changed()2172 text_state = svn_wc_notify_state_unchanged; in merge_file_changed()2175 if (text_state == svn_wc_notify_state_conflicted in merge_file_changed()2176 || text_state == svn_wc_notify_state_merged in merge_file_changed()2177 || text_state == svn_wc_notify_state_changed in merge_file_changed()[all …]