question about "Tree conflict: local edit, incoming delete upon merge"

Hi

I'm trying to apply a set of changes from our dev branch to our stable branch.
If I try to apply all changes at once I get a 21 tree conflics, so I'm
trying one by one, and committing at the end, so that I can be sure
I'm promoting the whole feature.

There is one specific revision that deletes a file.

emerson_at_emerson-desktop:~/workspace/branches/stable$ svn merge
http://subversion/svn/dotcom/trunk -c 80520

--- Merging r80520 into '.':
   C modules/com.yell.ucssearch/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
Summary of conflicts:
  Tree conflicts: 1

if I check the status of the file it shows:

emerson_at_emerson-desktop:~/workspace/branches/stable$ svn status
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
      C modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
> local edit, incoming delete upon merge

why is that? This is a simple delete , why does it show as a conflict?
the file hasn't changed by any other revision that is part of the
merge. Shouldn't it just remove the file locally or mark it for
deletion? Can't I apply several revisions to commit afterwards
together if one of them contains a deletion??

Could someone clarify this please?

Thanks
Emerson
Received on 2010-07-08 13:11:47 CEST