CMD: svnadmin create svn-test-work/local_tmp/repos --bdb-txn-nosync
<TIME = 1.137598>
CMD: svn import -m "Log message for revision 1." svn-test-work/local_tmp/greekfiles file:///home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/repos --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 1.406720>
Adding         svn-test-work/local_tmp/greekfiles/A
Adding         svn-test-work/local_tmp/greekfiles/A/B
Adding         svn-test-work/local_tmp/greekfiles/A/B/lambda
Adding         svn-test-work/local_tmp/greekfiles/A/B/E
Adding         svn-test-work/local_tmp/greekfiles/A/B/E/alpha
Adding         svn-test-work/local_tmp/greekfiles/A/B/E/beta
Adding         svn-test-work/local_tmp/greekfiles/A/B/F
Adding         svn-test-work/local_tmp/greekfiles/A/mu
Adding         svn-test-work/local_tmp/greekfiles/A/C
Adding         svn-test-work/local_tmp/greekfiles/A/D
Adding         svn-test-work/local_tmp/greekfiles/A/D/gamma
Adding         svn-test-work/local_tmp/greekfiles/A/D/G
Adding         svn-test-work/local_tmp/greekfiles/A/D/G/rho
Adding         svn-test-work/local_tmp/greekfiles/A/D/G/pi
Adding         svn-test-work/local_tmp/greekfiles/A/D/G/tau
Adding         svn-test-work/local_tmp/greekfiles/A/D/H
Adding         svn-test-work/local_tmp/greekfiles/A/D/H/chi
Adding         svn-test-work/local_tmp/greekfiles/A/D/H/omega
Adding         svn-test-work/local_tmp/greekfiles/A/D/H/psi
Adding         svn-test-work/local_tmp/greekfiles/iota

Committed revision 1.
CMD: svnadmin create svn-test-work/repositories/tree_conflict_tests-17 --bdb-txn-nosync
<TIME = 0.284122>
CMD: svnadmin dump svn-test-work/local_tmp/repos | svnadmin load svn-test-work/repositories/tree_conflict_tests-17 --ignore-uuid
<TIME = 0.337139>
CMD: svn co file:///home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/repositories/tree_conflict_tests-17 svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 1.280433>
A    svn-test-work/working_copies/tree_conflict_tests-17/A
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B/lambda
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B/E
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/alpha
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/beta
A    svn-test-work/working_copies/tree_conflict_tests-17/A/B/F
A    svn-test-work/working_copies/tree_conflict_tests-17/A/mu
A    svn-test-work/working_copies/tree_conflict_tests-17/A/C
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/gamma
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/G
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/pi
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/rho
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/tau
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/H
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/chi
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/omega
A    svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/psi
A    svn-test-work/working_copies/tree_conflict_tests-17/iota
Checked out revision 1.
CMD: svn mkdir svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.561218>
A         svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
CMD: svn add svn-test-work/working_copies/tree_conflict_tests-17/A/C/file --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.518075>
A         svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
CMD: svn commit -m "Add dir and file" svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.730469>
Adding         svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
Adding         svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
Transmitting file data .
Committed revision 2.
CMD: svn delete svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir svn-test-work/working_copies/tree_conflict_tests-17/A/C/file --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.545783>
D         svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
D         svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
CMD: svn commit -m "Remove dir and file" svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.700622>
Deleting       svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
Deleting       svn-test-work/working_copies/tree_conflict_tests-17/A/C/file

Committed revision 3.
CMD: svn update -r2 svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.797979>
A    svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
A    svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
Updated to revision 2.
CMD: svn ps propname propval svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.542093>
property 'propname' set on 'svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir'
CMD: svn ps propname propval svn-test-work/working_copies/tree_conflict_tests-17/A/C/file --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.504666>
property 'propname' set on 'svn-test-work/working_copies/tree_conflict_tests-17/A/C/file'
CMD: svn up svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.741333>
   C svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
   C svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
At revision 3.
Summary of conflicts:
  Tree conflicts: 2
CMD: svn proplist --verbose --xml svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/tau svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/rho svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/pi svn-test-work/working_copies/tree_conflict_tests-17/A/mu svn-test-work/working_copies/tree_conflict_tests-17/A/C/file svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/chi svn-test-work/working_copies/tree_conflict_tests-17/A/B/lambda svn-test-work/working_copies/tree_conflict_tests-17/A/D/H svn-test-work/working_copies/tree_conflict_tests-17/iota svn-test-work/working_copies/tree_conflict_tests-17/A svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/beta svn-test-work/working_copies/tree_conflict_tests-17/A/D svn-test-work/working_copies/tree_conflict_tests-17/A/C svn-test-work/working_copies/tree_conflict_tests-17/A/B svn-test-work/working_copies/tree_conflict_tests-17/A/D/G svn-test-work/working_copies/tree_conflict_tests-17/A/D/gamma svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/alpha svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/psi svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/omega svn-test-work/working_copies/tree_conflict_tests-17/A/B/F svn-test-work/working_copies/tree_conflict_tests-17/A/B/E svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.609355>
<?xml version="1.0"?>
<properties>
<target
   path="svn-test-work/working_copies/tree_conflict_tests-17/A/C/file">
<property
   name="propname">propval</property>
</target>
<target
   path="svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir">
<property
   name="propname">propval</property>
</target>
</properties>
CMD: svn status -v -u -q svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.728390>
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/iota
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/mu
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/lambda
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/alpha
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/beta
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/F
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/C
A  +  C          -        2 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
      >   local edit, incoming delete upon update
A  +  C          -        2 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
      >   local edit, incoming delete upon update
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/gamma
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/rho
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/pi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/tau
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/chi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/omega
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/psi
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17
Status against revision:      3
CMD: svn delete svn-test-work/working_copies/tree_conflict_tests-17/A/C --keep-local --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.592392>
D         svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
D         svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
D         svn-test-work/working_copies/tree_conflict_tests-17/A/C
CMD: svn status -v -u -q svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.675264>
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/iota
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/mu
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/lambda
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/alpha
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/beta
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/F
D                3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/C
?     C                                  svn-test-work/working_copies/tree_conflict_tests-17/A/C/file
      >   local edit, incoming delete upon update
?     C                                  svn-test-work/working_copies/tree_conflict_tests-17/A/C/dir
      >   local edit, incoming delete upon update
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/gamma
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/rho
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/pi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/tau
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/chi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/omega
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/psi
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17
Status against revision:      3
CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/B

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/B/E

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/B/F

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/C

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/D

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/D/G

CMD: entries-dump svn-test-work/working_copies/tree_conflict_tests-17/A/D/H

CMD: svn ci -m "log msg" svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.697390>
Deleting       svn-test-work/working_copies/tree_conflict_tests-17/A/C

Committed revision 4.
CMD: svn status -v -u -q svn-test-work/working_copies/tree_conflict_tests-17 --config-dir /home/stsp/svn/svn-trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
<TIME = 0.680875>
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/mu
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/lambda
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/alpha
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/E/beta
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B/F
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/B
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/gamma
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/rho
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/pi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/G/tau
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/chi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/omega
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D/H/psi
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A/D
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/A
                 3        1 jrandom      svn-test-work/working_copies/tree_conflict_tests-17/iota
                 3        3 jrandom      svn-test-work/working_copies/tree_conflict_tests-17
Status against revision:      4
PASS:  tree_conflict_tests.py 17: --keep-local del on dir with TCs inside