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. emer...@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: emer...@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
Re: question about Tree conflict: local edit, incoming delete upon merge
emerson wrote: emer...@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?? The message says it all: You have a local (ie in trunk) modification while the merge tries to delete that modified files. For you not to loose changes without knowing about it, SVN triggers a tree conflict. Only you, human, can decide what to do between keeping the file with the changes made in trunk, or accept the deletion that comes from the merge of the branch
Re: question about Tree conflict: local edit, incoming delete upon merge
Between the time you created the branch and the time you merge it, the trunk has evolved and the file has been modified. Use the log to see that. Regards Olivier PS: Please reply to the list as well. emerson wrote: Hi Olivier That is the thing, there is no changes done in that specific file! I just did: - revert that file - update from svn, nothing to update - merge that revision - got conflict One detail I left out: we are using 1.6 client and 1.4.4 server. Would that be the reason of these type of conflicts? Regards Emerson On 8 July 2010 12:34, Olivier Sannierobo...@free.fr wrote: emerson wrote: emer...@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?? The message says it all: You have a local (ie in trunk) modification while the merge tries to delete that modified files. For you not to loose changes without knowing about it, SVN triggers a tree conflict. Only you, human, can decide what to do between keeping the file with the changes made in trunk, or accept the deletion that comes from the merge of the branch
Re: question about Tree conflict: local edit, incoming delete upon merge
Ops, missed the reply-all. That specific file hasn't changed since the branch was created, still I got the tree conflict when it was deleted in svn. And for other files that I get tree conflict, they had been added and changed in previous revisions, but all of them had been merged locally. So... we are using 1.6 client and 1.4.4 server. Would that be the reason of these type of conflicts? On 8 July 2010 12:54, Olivier Sannier obo...@free.fr wrote: Between the time you created the branch and the time you merge it, the trunk has evolved and the file has been modified. Use the log to see that. Regards Olivier PS: Please reply to the list as well. emerson wrote: Hi Olivier That is the thing, there is no changes done in that specific file! I just did: - revert that file - update from svn, nothing to update - merge that revision - got conflict One detail I left out: we are using 1.6 client and 1.4.4 server. Would that be the reason of these type of conflicts? Regards Emerson On 8 July 2010 12:34, Olivier Sannierobo...@free.fr wrote: emerson wrote: emer...@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?? The message says it all: You have a local (ie in trunk) modification while the merge tries to delete that modified files. For you not to loose changes without knowing about it, SVN triggers a tree conflict. Only you, human, can decide what to do between keeping the file with the changes made in trunk, or accept the deletion that comes from the merge of the branch
