> 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
>
Right, nobody has replied to this post not even with suggestions. I was able to replicated it now (script attached) so hopefully someone will be able to help me.
I'm using Subversion 1.6.1 with Apache 2.2.11 on RHEL4.
The interesting things is that the problem occurs only if I use http: but not with file:, although I still think that something is wrong.
Using http, svn status returns
A + 2.0/a/aa
A + 2.0/a/aa/foo
A + 2.0/a/ab
A + 2.0/a/ab/foo
while svnlook changed inside the pre-commit hook returns
A 2.0/a/aa/
D 2.0/a/aa/foo
A 2.0/a/aa/foo
A 2.0/a/ab/
D 2.0/a/ab/foo
A 2.0/a/ab/foo
I wasn't expecting the deletion and that is screwing my scripts up.
Using file: svn status returns the same thing, but svnlook changed returns
A 2.0/a/aa/
A 2.0/a/ab/
Where are the addition of the two files? Should it be
A 2.0/a/aa/
A 2.0/a/aa/foo
A 2.0/a/ab/
A 2.0/a/ab/foo
If you need any information regarding my Apache configuration or anything just ask.
Thanks
Giulio
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2271249
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-15 16:08:13 CEST