When I do a svn status ., I get this:
! C auto-complete-config.elc
> local edit, incoming delete upon update
! + C auto-complete.elc
> local edit, incoming delete upon update
! + C popup.elc
> local edit, incoming delete upon update
! + C fuzzy.elc
> local edit, incoming delete upon update
basically, these files shouldn’t be in the repository. A developer has removed them. Then, I think I did a svn rm ... after the fact by mistake (should’ve done svn update . instead).
So now, when I do svn status ., I get these tree conflict messages.
I found the doc here but not sure how to “merge” it according to the doc.
How to get rid of them?
I think my working copy is in sync with the repository. Don’t know why these messages shows. These files should be removed and are removed as far as I know everywhere. I tried svn update . and svn revert . but I still get this message when I do svn status ..