Branko Čibej <brane_at_wandisco.com> writes:
> On 24.05.2013 09:32, Tobias Bading wrote:
>> So, the update claims to have updated 3449_spurious to r2 and the
>> merge claims to have merged c4 into that file. As it turns out, both
>> claims seem correct. The contents of 3449_spurious look correct.
>> However, "svn status" and "svn diff" run afterwards both swear that
>> the only local modification of the working copy is a property change
>> at the wc root, the addition of the svn:mergeinfo property.
>>
>> Any idea what's going on here? What could affect the python script in
>> a way that its merge is messed up, although the same merge run by hand
>> works fine?
>
> Are you by any chance running the tests with the sleep for timestamps
> disabled? That could cause the effects you're seeing, especially
> combined with running on a FAT filesystem (which has 2-second timestamp
> granularity).
It does sound like a sleep/timestamp problem. If you take a "broken"
working copy where the merge has changed 3449_spurious but status/diff
don't show it then running 'touch 3449_spurious' will change the
timestamp and should make status/diff work.
If the text change made by merge is not showing up in status it implies
that the preceeding update didn't sleep properly so we should be able to
confirm with this patch:
Index: subversion/tests/cmdline/diff_tests.py
===================================================================
--- subversion/tests/cmdline/diff_tests.py (revision 1485754)
+++ subversion/tests/cmdline/diff_tests.py (working copy)
@@ -3853,6 +3853,7 @@
svntest.actions.run_and_verify_svn(None, None, [],
'update', '-r2', wc_dir)
+ from time import sleep;sleep(2)
svntest.actions.run_and_verify_svn(None, None, [],
'merge', '-c4', '^/', wc_dir)
However this test explictly re-enables sleeping so the test should work
without that explicit sleep. What filesystem are you using?
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2013-05-24 11:25:49 CEST