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

Unexpected conflict that resolves intself

From: Giulio Troccoli <giulio.troccoli_at_uk.linedata.com>
Date: Thu, 11 Jun 2009 11:39:55 +0100

Hello guys, I hope you can help me with this becuase it's really annoying.

I am testing SVN 1.6.2. At the moment we have 1.4.4.

Our repository doesn't use the classic trunk/branches/tags layout, although we do have something similar.

For each supported relase we have two streams: test and cand. Developers work in the test stream. When a change needs to go on an old release we have a script that automatically merges the changes into the next test stream. So, for example, if a developer commits some changed into 1.40/test, then the script will merge those changes into 1.51/test, then from 1.51/test to 1.60/test and finally from 1.60/test to 1.61/test.

The script, smerge, has to be run manully by the developer on the SVN server box. This is becuase we didn't have (with 1.4.4) automatic conflict resolution and we don't want it now with 1.6.2. So, developers will need to manually resolve the conflicts during the merging process. And yes, we do keep a WC of the whole repository on the server just for this.

With 1.4.4 everything worked fine. With 1.6.2 however, almost always I have a conflict on the root of the tree, e.g. 1.61/test/src (src is the only directory in test and it's there for legacy reasons). Oddily though the conflict is not during the merge, which developers would be asked to fix, but during the commit

svn: Commit failed (details follow):
svn: Conflict at '/dip/1.61/test/src'

Even more weird is the fact that if I don't do anything and simply try the merging again then everything is fine.

I thought that maybe I had the conflict because the WC for /dip/1.61/test/src was not up-to-date but I do issue an 'svn update' before merging.

As anyone have any idea why the conflict? And how to resolve it?

Thanks
Giulio

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2361229

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-11 12:41:44 CEST

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