[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict after a simple delete

From: Stein Somers <ssomers_at_opnet.com>
Date: Wed, 23 Sep 2009 13:43:26 +0200

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


        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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 13:44:36 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.