Hi,
I've observed a concerning problem with subversion (1.4.3 server with
FSFS backend). Details (log, diff, propgets) are below. The gist is that
a property was modified in revision X+1, then a file was modified in
revision X+2; but the value of the property in X+2 is reverted to its
value in revision X.
It seems highly likely in this case that the user making the second
commit in fact didn't change the property (it usually only gets changed
by a merging tool which wraps svn, which he wasn't using); so it seems
that the property has been corrupted.
It's worth noting that the timestamp on both commits are similar (but
not identical, according to svn log --xml):
r128441: 2007-09-11T10:02:00.689184Z
r128442: 2007-09-11T10:02:00.783201Z
Should I raise an issue?
thanks
Dave
nb: commit 128442 was made with svn client 1.3.1 (r19032). Not sure
about 128441.
$ svn pg dsct-submerge:merge-info:from_froghall31:to_trunk -r128440
http://cam-svn1/svn/devsys/rvct
merged-revisions: 121043:127844
$ svn pg dsct-submerge:merge-info:from_froghall31:to_trunk -r128441
http://cam-svn1/svn/devsys/rvct
merged-revisions:
121043:127844,127894,127916,127984,128091:128093,128098,128233
$ svn pg dsct-submerge:merge-info:from_froghall31:to_trunk -r128442
http://cam-svn1/svn/devsys/rvct
merged-revisions: 121043:127844
svn log -v -r128441:128442 http://cam-svn1/svn/devsys/rvct
------------------------------------------------------------------------
r128441 | agrant | 2007-09-11 11:02:00 +0100 (Tue, 11 Sep 2007) | 1 line
Changed paths:
M /
(by submerge.pl) updated
'dsct-submerge:merge-info:from_froghall31:to_trunk' to
'121043:127844,127894,127916,127984,128091:128093,128098,128233'
------------------------------------------------------------------------
r128442 | sellis | 2007-09-11 11:02:00 +0100 (Tue, 11 Sep 2007) | 1 line
Changed paths:
M /armcc/urd/TestGnuExtensions/gnu_syserr.c
DE455813: Merged rev 126173 from froghall31 to urd.
------------------------------------------------------------------------
$ svn diff -r128440:128441 http://cam-svn1/svn/devsys/rvct
Property changes on: .
___________________________________________________________________
Name: dsct-submerge:merge-info:from_froghall31:to_trunk
- merged-revisions: 121043:127844
+ merged-revisions:
121043:127844,127894,127916,127984,128091:128093,128098,128233
$ svn diff -r128441:128442 http://cam-svn1/svn/devsys/rvct
Index: armcc/urd/TestGnuExtensions/gnu_syserr.c
===================================================================
--- armcc/urd/TestGnuExtensions/gnu_syserr.c (revision 128441)
+++ armcc/urd/TestGnuExtensions/gnu_syserr.c (revision 128442)
@@ -14,7 +14,7 @@
if (({
int s1 = 0;
(({
- const * s2 = ("foo");
+ const char * s2 = ("foo");
s2;
}));
}))
@@ -38,7 +38,7 @@
if (f_434390_2b(argv[i]) == -1) { }
}
-char *Tokens_434390[];
+char *Tokens_434390[100];
void f_434390_3b(const char *displayMode)
{
char *token;
@@ -55,7 +55,7 @@
s;
}))
: 0);
- })) : 1) == 0)
+ })) : 0) == 0)
break;
}
}
Property changes on: .
___________________________________________________________________
Name: dsct-submerge:merge-info:from_froghall31:to_trunk
- merged-revisions:
121043:127844,127894,127916,127984,128091:128093,128098,128233
+ merged-revisions: 121043:127844
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 17 18:57:32 2007