Re: Tree conflict after a simple delete

Giulio Troccoli wrote:
> am I correct in saying that you think other changes have happened

Yes, to the file http://localhost/svn-icon/5.31/test/src/ic/ud/icudcc31.c in
particular, after the revision that the wip branch sprouted from.

> If I found out this is a false positive, is there a way to tell Subversion "look, this is a false positive" ?

As said I don't understand the term "false positive". There are changes
interfering with each other. How could svn assume one of them is the right
change and not report a "positive"? Only if I tell it to "accept theirs".

As far as I know, in svn 1.6.5, regardless of how you want to resolve the
conflict, you first have to say:

        svn resolved /5.31/test/src/ic/ud/icudcc31.c

Then

        svn stat /5.31/test/src/ic/ud/icudcc31.c

will show no change whatsoever is merged in. You have to apply the change
manually. If you're the delete is what you want, just delete again:

        svn rm /5.31/test/src/ic/ud/icudcc31.c

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398838
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].