Re: Bogus Conflict During Commit

Chuck Holzwarth wrote:
> We are running subversion 1.5.4 and tortoise 1.6.1 and a user has
> reported the following: I'm trying to commit a folder with changes. I
> get a conflict on a file (scc) that does not exist in the repo, nor
> in my local folder. Yet the commit fails because it says there is a
> conflict. I also tried a cleanup. still researching why this is
> happening.

A commit can not result in or throw a conflict.
But maybe this is what happened:
http://subversion.tigris.org/faq.html#wc-out-of-date

Stefan

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2369241

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-09 07:27:04 CEST