Svnmerge croaks em conflito misterioso
Pergunta
Executamos o SVN 1.6.x no servidor e no cliente. Eu ramificei, trabalhei por várias semanas, desmaiado algumas vezes e depois parti para aumentar. svnmerge.py, conforme registrado abaixo, divide as confirmações em dois conjuntos e, no segundo conjunto, encontra um (falso?) Conflito de árvore e depois recebe um erro de subversão e implodia (consulte a parte inferior do log).
Estou detestando isso em duas partes, já que o estado intermediário não estava realmente funcionando, então executando manualmente o primeiro conjunto de revisões e, em seguida, o segundo não é algo que eu quero fazer.
property 'svnmerge-integrated' set on '.'
--- Merging r5171 through r6286 into '.':
U java/buildtools/src/main/resources/checkstyle.xml
U java/buildtools/pom.xml
U java/com.basistech.rex2009.common/pom.xml
U java/tokenize_lines/pom.xml
U java/runtime/pom.xml
U java/ldctools/pom.xml
U java/models/pom.xml
U java/gazdecode/pom.xml
U java/annotatortools/pom.xml
Skipped 'java/pom-version.pl'
U java/common/pom.xml
U java/parent/pom.xml
U java/pom.xml
A java/ap-segmentation
Skipped 'java/ap-segmentation/TODO'
Skipped 'java/ap-segmentation/notes.txt'
A java/ap-segmentation/scripts
Skipped 'java/ap-segmentation/scripts/prune-nbest.perl'
Skipped 'java/ap-segmentation/scripts/prune-threshold.perl'
A java/ap-segmentation/src
A java/ap-segmentation/src/test
A java/ap-segmentation/src/test/java
A java/ap-segmentation/src/test/java/com
A java/ap-segmentation/src/test/java/com/basistech
A java/ap-segmentation/src/test/java/com/basistech/seg
Skipped 'java/ap-segmentation/src/test/java/com/basistech/seg/SymbolsTest.java'
Skipped 'java/ap-segmentation/src/test/java/com/basistech/seg/FeatureVectorTest.java'
A java/ap-segmentation/src/test/resources
A java/ap-segmentation/src/main
A java/ap-segmentation/src/main/java
A java/ap-segmentation/src/main/java/com
A java/ap-segmentation/src/main/java/com/basistech
A java/ap-segmentation/src/main/java/com/basistech/seg
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/AveragedPerceptron.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Decode.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Trainer.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Decoder.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/FeatureSet.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Symbols.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Feature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/SegFeatures.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Train.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/FeatureVector.java'
A java/ap-segmentation/src/main/java/com/basistech/seg/features
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/LastLengthFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/ConsecStartCharsFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/FirstLengthFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBeforeWordFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBigramIntraSegFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/FirstLastCharsFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordBigramFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordLengthAndPreviousFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/SingleCharFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordLengthAndNextFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBigramInterSegFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/ConsecEndCharsFeature.java'
A java/ap-segmentation/src/main/resources
Skipped 'java/ap-segmentation/pom.xml'
U java/maven-rex2009task-plugin/pom.xml
U java/corpus-tasks/pom.xml
U java/ama/pom.xml
U java/rlp-bl-annotate/pom.xml
U java/ape/pom.xml
A scripts
Skipped 'scripts/score'
Skipped 'scripts/mwseg.pl'
Skipped 'scripts/pipelines.mk'
A data
A data/scripts
Skipped 'data/scripts/cleanup-whitespace.perl'
Skipped 'data/Makefile'
Summary of conflicts:
Skipped paths: 36
property 'svnmerge-integrated' set on '.'
--- Merging r6297 through r6302 into '.':
C java/common/src/main/java/com/basistech/perceptron
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/Decoder.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/LastLengthFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/ConsecStartCharsFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/FirstLengthFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBeforeWordFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBigramIntraSegFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/FirstLastCharsFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordBigramFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordLengthAndPreviousFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/SingleCharFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/WordLengthAndNextFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/CharBigramInterSegFeature.java'
Skipped 'java/ap-segmentation/src/main/java/com/basistech/seg/features/ConsecEndCharsFeature.java'
Summary of conflicts:
Tree conflicts: 1
Skipped paths: 14
property 'svnmerge-integrated' set on '.'
svnmerge: command execution failed (exit code: 1)
svn --non-interactive merge --force -r 6341:6426 http://svn.basistech.net/engineering/rex2009/branches/worm .
svn: Attempt to add tree conflict that already exists
svn: Error reading spooled REPORT request response
Solução
A explicação surgiu, e acho que isso pode ser interessante para outra pessoa.
Nunca, nunca, esqueça de cometer uma série de svnmerge.py antes de fazer outra coisa. Combinar uma fusão com outras edições é uma receita para um desastre, e o desastre é o que você vê na pergunta.