You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Giulio T <gi...@uk.linedata.com> on 2009/05/12 13:30:45 UTC
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@subversion.tigris.org].
RE: Subversion thinks I have moved files
Posted by Giulio Troccoli <gi...@uk.linedata.com>.
>
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
-----Original Message-----
> From: webpost@tigris.org [mailto:webpost@tigris.org]
> Sent: 19 May 2009 11:08
> To: users@subversion.tigris.org
> Subject: RE: Subversion thinks I have moved files
>
> Was my script attached to the email this time? Has anyone tried it?
>
> Sorry to be a bit pushy but this IS a showstopper for my upgrade.
>
> Giulio
So, no-one has tried it yet and can help me and shed some light?
Giulio
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2328321
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Subversion thinks I have moved files
Posted by we...@tigris.org.
Was my script attached to the email this time? Has anyone tried it?
Sorry to be a bit pushy but this IS a showstopper for my upgrade.
Giulio
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2310599
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Subversion thinks I have moved files
Posted by Giulio Troccoli <gi...@uk.linedata.com>.
>
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
-----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2009b@ryandesign.com]
> Sent: 15 May 2009 20:58
> To: Giulio Troccoli
> Cc: users@subversion.tigris.org
> Subject: Re: Subversion thinks I have moved files
>
> On May 15, 2009, at 09:07, Giulio Troccoli wrote:
>
> >> 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.
> >
> > 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 didn't see a script attached to your email. Seeing the
> script might help us figure out the problem.
>
> > 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.
>
> You're saying that if you commit via http:// then svnlook
> changed says:
>
> 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
>
> but if you commit the same thing to the same repository via
> file:/// then svnlook changed says:
>
> A 2.0/a/aa/
> A 2.0/a/ab/
>
> ? I agree that is odd.
>
I don't understand what happened. I sent the email via the web and I checked and double checked that the script was attached. Anyway, I have attached it now.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2297412
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Subversion thinks I have moved files
Posted by Ryan Schmidt <su...@ryandesign.com>.
On May 15, 2009, at 09:07, Giulio Troccoli wrote:
>> 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.
>
> 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 didn't see a script attached to your email. Seeing the script might
help us figure out the problem.
> 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.
You're saying that if you commit via http:// then svnlook changed says:
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
but if you commit the same thing to the same repository via file:///
then svnlook changed says:
A 2.0/a/aa/
A 2.0/a/ab/
? I agree that is odd.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2274130
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Subversion thinks I have moved files
Posted by Giulio Troccoli <gi...@uk.linedata.com>.
> 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@subversion.tigris.org].