Re: Strange behavior on update

Greetings, Merlin Morgenstern!

> 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?

It is not a problem, but normal Subversion behavior as explained in
documentation.
http://svnbook.org/

--
WBR,
 Andrey Repin (anrdaemon_at_freemail.ru) 04.05.2009, <20:23>
Sorry for my terrible english...
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2057834
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].