On Thu, Apr 15, 2010 at 12:18:58PM -0500, Hyrum K. Wright wrote:
> 1.6.11 tarballs are up, the magic revision is r934486:
>
> http://people.apache.org/~hwright/svn/1.6.11/
>
> This differs very little from 1.6.10, but it does have important fixes which
> have been spot tested. Please do you standard tests on this release when
> signing it. (And don't even think about declaring this as "released" until
> I say so, for reasons I won't expound upon here.)
>
> -Hyrum
Merge test 63 fails for me for fsfs x serf (with serf 0.3.0).
Transcript below.
Stefan
CMD: svnadmin create svn-test-work/repositories/merge_tests-63 --bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.173002>
CMD: svnadmindump svn-test-work/local_tmp/repos | svnadminload svn-test-work/repositories/merge_tests-63 --ignore-uuid <TIME = 0.209591>
CMD: svn co http://localhost:8081/svn-test-work/repositories/merge_tests-63 svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.633105>
A svn-test-work/working_copies/merge_tests-63/A
A svn-test-work/working_copies/merge_tests-63/A/B
A svn-test-work/working_copies/merge_tests-63/A/B/lambda
A svn-test-work/working_copies/merge_tests-63/A/B/E
A svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
A svn-test-work/working_copies/merge_tests-63/A/B/E/beta
A svn-test-work/working_copies/merge_tests-63/A/mu
A svn-test-work/working_copies/merge_tests-63/A/D
A svn-test-work/working_copies/merge_tests-63/A/D/gamma
A svn-test-work/working_copies/merge_tests-63/A/D/G
A svn-test-work/working_copies/merge_tests-63/A/D/G/pi
A svn-test-work/working_copies/merge_tests-63/A/D/G/rho
A svn-test-work/working_copies/merge_tests-63/A/D/G/tau
A svn-test-work/working_copies/merge_tests-63/A/D/H
A svn-test-work/working_copies/merge_tests-63/A/D/H/chi
A svn-test-work/working_copies/merge_tests-63/A/D/H/omega
A svn-test-work/working_copies/merge_tests-63/A/D/H/psi
A svn-test-work/working_copies/merge_tests-63/iota
A svn-test-work/working_copies/merge_tests-63/A/C
A svn-test-work/working_copies/merge_tests-63/A/B/F
Checked out revision 1.
CMD: svn copy http://localhost:8081/svn-test-work/repositories/merge_tests-63/A svn-test-work/working_copies/merge_tests-63/A_COPY --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.625141>
A svn-test-work/working_copies/merge_tests-63/A_COPY/B
A svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
A svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
A svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
A svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
A svn-test-work/working_copies/merge_tests-63/A_COPY/mu
A svn-test-work/working_copies/merge_tests-63/A_COPY/D
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
A svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
A svn-test-work/working_copies/merge_tests-63/A_COPY/C
A svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
Checked out revision 1.
A svn-test-work/working_copies/merge_tests-63/A_COPY
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.753991>
Adding svn-test-work/working_copies/merge_tests-63/A_COPY
Committed revision 2.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.521097>
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 2
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.746972>
Sending svn-test-work/working_copies/merge_tests-63/A/D/H/psi
Transmitting file data .
Committed revision 3.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.515770>
3 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 3
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.747893>
Sending svn-test-work/working_copies/merge_tests-63/A/D/G/rho
Transmitting file data .
Committed revision 4.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.532273>
3 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
4 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 4
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.746158>
Sending svn-test-work/working_copies/merge_tests-63/A/B/E/beta
Transmitting file data .
Committed revision 5.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.534326>
3 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
4 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
5 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 5
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.742702>
Sending svn-test-work/working_copies/merge_tests-63/A/D/H/omega
Transmitting file data .
Committed revision 6.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.538089>
3 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
6 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
4 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
5 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 6
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.745906>
Sending svn-test-work/working_copies/merge_tests-63/A/mu
Transmitting file data .
Committed revision 7.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.530613>
3 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
6 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
4 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
5 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B
7 7 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
1 1 jrandom svn-test-work/working_copies/merge_tests-63/A
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
2 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
1 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
1 1 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 7
CMD: svn up svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.542644>
At revision 7.
CMD: svn ps prop:name propval svn-test-work/working_copies/merge_tests-63/A/D --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.299567>
property 'prop:name' set on 'svn-test-work/working_copies/merge_tests-63/A/D'
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.933022>
Sending svn-test-work/working_copies/merge_tests-63/A/D
Committed revision 8.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.512307>
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
7 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
7 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
7 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
7 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
7 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
8 8 jrandom svn-test-work/working_copies/merge_tests-63/A/D
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
7 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
7 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
7 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B
7 7 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
7 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
7 7 jrandom svn-test-work/working_copies/merge_tests-63/A
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
7 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
7 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
7 7 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 8
CMD: svn up svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.520673>
At revision 8.
CMD: svn ps prop:name propval svn-test-work/working_copies/merge_tests-63/A --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.298382>
property 'prop:name' set on 'svn-test-work/working_copies/merge_tests-63/A'
CMD: svn ci -m "log msg" svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.944314>
Sending svn-test-work/working_copies/merge_tests-63/A
Committed revision 9.
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63 --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.511452>
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/gamma
8 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/pi
8 4 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/rho
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/G/tau
8 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/chi
8 6 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/omega
8 3 jrandom svn-test-work/working_copies/merge_tests-63/A/D/H/psi
8 8 jrandom svn-test-work/working_copies/merge_tests-63/A/D
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/lambda
8 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/alpha
8 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B/E/beta
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/B/F
8 5 jrandom svn-test-work/working_copies/merge_tests-63/A/B
8 7 jrandom svn-test-work/working_copies/merge_tests-63/A/mu
8 1 jrandom svn-test-work/working_copies/merge_tests-63/A/C
9 9 jrandom svn-test-work/working_copies/merge_tests-63/A
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/lambda
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/alpha
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/E/beta
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/B/F
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/mu
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/C
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/gamma
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/pi
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/rho
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/G/tau
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/chi
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/omega
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY/D/H/psi
8 2 jrandom svn-test-work/working_copies/merge_tests-63/A_COPY
8 1 jrandom svn-test-work/working_copies/merge_tests-63/iota
8 8 jrandom svn-test-work/working_copies/merge_tests-63
Status against revision: 9
CMD: svn co http://localhost:8081/svn-test-work/repositories/merge_tests-63/A_COPY svn-test-work/working_copies/merge_tests-63.immediates --depth immediates --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.539113>
A svn-test-work/working_copies/merge_tests-63.immediates/mu
A svn-test-work/working_copies/merge_tests-63.immediates/D
A svn-test-work/working_copies/merge_tests-63.immediates/C
A svn-test-work/working_copies/merge_tests-63.immediates/B
Checked out revision 9.
CMD: svn merge -r4:9 http://localhost:8081/svn-test-work/repositories/merge_tests-63/A svn-test-work/working_copies/merge_tests-63.immediates --dry-run --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 1.194382>
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates':
U svn-test-work/working_copies/merge_tests-63.immediates/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates/D':
C svn-test-work/working_copies/merge_tests-63.immediates/D/H
U svn-test-work/working_copies/merge_tests-63.immediates/D
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates/B':
C svn-test-work/working_copies/merge_tests-63.immediates/B/E
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates':
U svn-test-work/working_copies/merge_tests-63.immediates
Summary of conflicts:
Tree conflicts: 2
CMD: svn merge -r4:9 http://localhost:8081/svn-test-work/repositories/merge_tests-63/A svn-test-work/working_copies/merge_tests-63.immediates --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 1.205657>
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates':
U svn-test-work/working_copies/merge_tests-63.immediates/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates/D':
C svn-test-work/working_copies/merge_tests-63.immediates/D/H
U svn-test-work/working_copies/merge_tests-63.immediates/D
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates/B':
C svn-test-work/working_copies/merge_tests-63.immediates/B/E
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.immediates':
U svn-test-work/working_copies/merge_tests-63.immediates
Summary of conflicts:
Tree conflicts: 2
CMD: svn proplist --verbose svn-test-work/working_copies/merge_tests-63.immediates svn-test-work/working_copies/merge_tests-63.immediates/D svn-test-work/working_copies/merge_tests-63.immediates/C svn-test-work/working_copies/merge_tests-63.immediates/B svn-test-work/working_copies/merge_tests-63.immediates/mu --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.295645>
Properties on 'svn-test-work/working_copies/merge_tests-63.immediates':
prop:name
propval
svn:mergeinfo
/A:5-9
Properties on 'svn-test-work/working_copies/merge_tests-63.immediates/D':
prop:name
propval
svn:mergeinfo
/A/D:5-9*
Properties on 'svn-test-work/working_copies/merge_tests-63.immediates/C':
svn:mergeinfo
/A/C:5-9*
Properties on 'svn-test-work/working_copies/merge_tests-63.immediates/B':
svn:mergeinfo
/A/B:5-9*
CMD: svn status -v -u -q svn-test-work/working_copies/merge_tests-63.immediates --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.508630>
! C svn-test-work/working_copies/merge_tests-63.immediates/D/H
> local delete, incoming edit upon merge
M 9 1 jrandom svn-test-work/working_copies/merge_tests-63.immediates/D
! C svn-test-work/working_copies/merge_tests-63.immediates/B/E
> local delete, incoming edit upon merge
M 9 1 jrandom svn-test-work/working_copies/merge_tests-63.immediates/B
M 9 1 jrandom svn-test-work/working_copies/merge_tests-63.immediates/mu
M 9 1 jrandom svn-test-work/working_copies/merge_tests-63.immediates/C
M 9 2 jrandom svn-test-work/working_copies/merge_tests-63.immediates
Status against revision: 9
CMD: svn co http://localhost:8081/svn-test-work/repositories/merge_tests-63/A_COPY svn-test-work/working_copies/merge_tests-63.files --depth files --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.518732>
A svn-test-work/working_copies/merge_tests-63.files/mu
Checked out revision 9.
CMD: svn merge -r4:9 http://localhost:8081/svn-test-work/repositories/merge_tests-63/A svn-test-work/working_copies/merge_tests-63.files --dry-run --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 1.153465>
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/B
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files/mu':
U svn-test-work/working_copies/merge_tests-63.files/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/D
U svn-test-work/working_copies/merge_tests-63.files
Summary of conflicts:
Tree conflicts: 2
CMD: svn merge -r4:9 http://localhost:8081/svn-test-work/repositories/merge_tests-63/A svn-test-work/working_copies/merge_tests-63.files --config-dir /home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 1.162267>
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files/mu':
U svn-test-work/working_copies/merge_tests-63.files/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/D
C svn-test-work/working_copies/merge_tests-63.files/B
U svn-test-work/working_copies/merge_tests-63.files
Summary of conflicts:
Tree conflicts: 2
=============================================================
Merge outputs differ
The dry-run merge output:
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/B
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files/mu':
U svn-test-work/working_copies/merge_tests-63.files/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/D
U svn-test-work/working_copies/merge_tests-63.files
Summary of conflicts:
Tree conflicts: 2
The full merge output:
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files/mu':
U svn-test-work/working_copies/merge_tests-63.files/mu
--- Merging r5 through r9 into 'svn-test-work/working_copies/merge_tests-63.files':
C svn-test-work/working_copies/merge_tests-63.files/D
C svn-test-work/working_copies/merge_tests-63.files/B
U svn-test-work/working_copies/merge_tests-63.files
Summary of conflicts:
Tree conflicts: 2
=============================================================
EXCEPTION: SVNUnmatchedError
Traceback (most recent call last):
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/main.py", line 1225, in run
rc = self.pred.run(**kw)
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/testcase.py", line 204, in run
return self.test_case.run(sandbox=sandbox)
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/merge_tests.py", line 7670, in merge_to_sparse_directories
None, 1)
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/actions.py", line 820, in run_and_verify_merge
b_baton, check_props, dry_run)
File "/home/stsp/svn/svn-1.6.11/subversion/tests/cmdline/svntest/actions.py", line 928, in run_and_verify_merge2
raise main.SVNUnmatchedError
SVNUnmatchedError
FAIL: merge_tests.py 63: merge to sparse directories
--
Sent from my Nokia 1100
Received on 2010-04-16 12:06:41 CEST