Strange behavior on update

From: Merlin Morgenstern <merlin_x_at_fastmail.fm>
Date: Mon, 04 May 2009 18:05:37 +0200

Hi there,

I am facing a problem with one computer that is causing strange behavior
on "update".

The original file is not merged, but altered and now contains info like
this:

<<<<<<< .mine
ID BETWEEN 50001 AND 55000
=======
ID BETWEEN 50001 AND 60000
>>>>>>> .r162

Furthermore there are new files with the same name, but different extension:
.mine
.r162

I believe this is the revision.

All other PC's accessing the repository do not have that problem and
worke as they should.

Does anybody have an idea how to fix this?

Thank you in advance,

Merlin

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-04 18:11:35 CEST