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

Re: Double file entries after merge of moves/refactoring; possible bug?

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 17 Jun 2009 15:22:25 +0100

On Wed, Jun 17, 2009 at 02:41:33PM +0200, Hermanns, Horst wrote:
> Hi,
>
> additional Info.
>
> I noticed this behavier with:
>
> SVN Client, 1.5.6/1.6.2 (Windows JavaHL and Linux JavaHL)
> SVN Server, 1.5.5 (r34862, Linux-Server, Apache 2.2.11 with
> mod_dav_svn)

You should update the client and the server to 1.6.

I sounds like you are running into tree conflicts during merges.
The behaviour you are seeing with 1.5 can be explained by
the fact that 1.5 behaves pretty much non-deterministic when
merging incompatible tree changes. Subversion 1.6 attempts to detect
a lot of such problems and flags conflicts in the target working
copy of the merge accordingly.

See http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
and the files in the directory
http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts
(warning, some stuff in there is seriously out-dated!)
and also search the archives of the dev and users list for
"tree conflict". This should give you a lot of information.

Stefan
Received on 2009-06-17 16:23:25 CEST

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