Arwin Arni <ar...@collab.net> writes: > In my pursuit to understand libsvn_wc/update_editor.c I came across an > unnecessary member (skip_descendants) in the > dir_baton. skip_descendants and skip_this are being set at the same > time and have identical values at all times. I have removed one of > these (skip_descendants) and the *relevant* code that I understand as > being unreachable. I have attached the patch and a log message. Please > review and respond.
This is one of the bits of code that needs some work for 1.7. In 1.6 we generally skipped all the changes within a tree conflict, but in 1.7 we can always make all the changes to the metadata; it's only changes to the working tree that need to be skipped. I'll take a look at your patch, it looks like a useful step. -- Philip