Subversion thinks I have moved files

Hi everybody,

I am in the process of testing the new svn 1.6.2 so that we can upgrade our 1.4.4 server.

I have done a 'merge --accept postone --ignore-ancestry', and svn st shows

localhost test> svn st
C src/dip/makefile.svn
A + src/dip/gtlogic
A + src/dip/gtlogic/makefile.svn
A + src/dip/gtlogic/gtParse.c
A + src/dip/gtlogic/gtLogic.c
A + src/dip/gtcomms
A + src/dip/gtcomms/makefile.svn
A + src/dip/gtcomms/gtCommsLogin.c
A + src/dip/gtcomms/gtCommsLogout.c

I've fixed the conflict and issue 'svn resolve --accept working --depth infinity'. I need the depth switch because this is all part of a script that issues the resolve command only after all conflicts have been resolved by the user. After this the status reports the same as above (well, besides the conflict of course)

But when I commit, 'svnlook changed' in the pre-commit hook reports the following

A dip/1.40/test/src/dip/gtcomms/
D dip/1.40/test/src/dip/gtcomms/gtCommsLogin.c
A dip/1.40/test/src/dip/gtcomms/gtCommsLogin.c
D dip/1.40/test/src/dip/gtcomms/gtCommsLogout.c
A dip/1.40/test/src/dip/gtcomms/gtCommsLogout.c
D dip/1.40/test/src/dip/gtcomms/makefile.svn
A dip/1.40/test/src/dip/gtcomms/makefile.svn
A dip/1.40/test/src/dip/gtlogic/
D dip/1.40/test/src/dip/gtlogic/gtLogic.c
A dip/1.40/test/src/dip/gtlogic/gtLogic.c
D dip/1.40/test/src/dip/gtlogic/gtParse.c
A dip/1.40/test/src/dip/gtlogic/gtParse.c
D dip/1.40/test/src/dip/gtlogic/makefile.svn
A dip/1.40/test/src/dip/gtlogic/makefile.svn
U dip/1.40/test/src/dip/makefile.svn

This is making the pre-commit hook failing.

Unfortunately I haven't been able, yet, to replicate it with a script I can post here. It consistenly happens however in my test environment so if you have any suggestion or need me to try something I can do it without causing any issue.

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=2213427

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-12 15:31:56 CEST