This morning I made 3 separate commits to trunk. In each case I did an
'svn up' before the commit, the number of files being
added/deleted/modified was <=8 and all conflicts had been resolved.
In 1 case I had no problem but in each of two other cases, my commit
hung at the "Transmitting files ...." line. The files were in fact
committed successfully, but after about 5 minutes my SVN client returned
an error message like the one below:
[li11-226:confstep] 528 $ svn ci -F ../message
Sending MANIFEST
Adding t/configure/031_base.t
Adding t/configure/032_data.t
Adding t/configure/033_step.t
Adding t/configure/034_step.t
Adding t/configure/035_step.t
Adding t/configure/036_config_steps.t
Deleting t/configure/base.t
Deleting t/configure/config_steps.t
Deleting t/configure/data.t
Deleting t/configure/step.t
Transmitting file data .......svn: Commit failed (details follow):
svn: MERGE request failed on '/parrot/trunk'
svn: MERGE of '/parrot/trunk': 200 OK (https://svn.perl.org)
As stated, the files actually got into trunk okay, as confirmed by one
of the bots on #parrot and by my ability to do 'svn up' on a separate
sandbox. But on my terminal the commit ended sloppily 2 out of 3 times.
I googled for this but did not quickly find much that was helpful.
Diagnosis? Thanks in advance.
kid51
