Re: Strange behavior on update

On Mon, May 04, 2009 at 07:52:33PM +0200, Merlin Morgenstern wrote:
> >> <<<<<<< .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

These are conflict markers. Read here:

http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html

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

Looks like someone changed that ID BETWEEN line on the working copy on
the "malfunctioning" machine and never committed that change.

> >> Does anybody have an idea how to fix this?
> >
> > It is not a problem, but normal Subversion behavior as explained in
> > documentation.
> >
>
> Well actually it is a problem. All the other computers which work with
> this repository work as expected. Files are merged etc.
> With this one, the files are not merged, but the new files created and
> the old one contains info on the changes. This is useless in my case.

Read the section I linked. Sounds like you're missing some fundamental
concepts about merging and conflicts.

hth,
tyler
Received on 2009-05-04 20:01:51 CEST