2009-02-17 08:29:27 Greg Stein napisał(a):
>Author: gstein
>Date: Mon Feb 16 23:29:31 2009
>New Revision: 35917
>
>Log:
>Merge work in from the explore-wc branch.
>
>Revisions merged, and primary (desired) change:
> 35440: introduction of old-and-busted.c
> 35594: includes and a function added to old-and-busted.c
> 35796: removal of (most of) the propcaching feature
> 35824: continued removal of propcaching
> 35908: add writing code to old-and-busted.c
> 35909: manual apply of r35551 (remove SHOW_HIDDEN) to old-and-busted.c
> 35911: manual apply of r35868 (cachable_props changes) to old-and-busted
> 35916: propcaching removal fixes
>
>Some merge conflicts arose in read_entries(), so I just gutted the whole
>function and had it call svn_wc__read_entries_old() from old-and-busted.
>There weren't conflicts in svn_wc__entries_write(), but that function is
>going to be dramatically altered, so I did the same deferral.
>
>All tests continue to pass.
>
>Added:
> trunk/subversion/libsvn_wc/old-and-busted.c
> - copied, changed from r35440,
> branches/explore-wc/subversion/libsvn_wc/old-and-busted.c Modified:
> trunk/ (props changed)
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/entries.c
> trunk/subversion/libsvn_wc/entries.h
> trunk/subversion/libsvn_wc/log.c
> trunk/subversion/libsvn_wc/props.c
> trunk/subversion/libsvn_wc/wc.h
Merging r35917 to the svnpatch-diff branch causes failure of
diff_tests.py 51: "test svnpatch format in various ways"
because the svnpatch block doesn't contain changes of properties.
Could anybody help with fixing it or should I revert a part of
r35917 and its followups on this branch?
CMD: svnadmin create svn-test-work/repositories/diff_tests-51 --bdb-txn-nosync <TIME = 0.127433>
CMD: svnadmindump svn-test-work/local_tmp/repos | svnadminload svn-test-work/repositories/diff_tests-51 --ignore-uuid <TIME = 0.005969>
CMD: svn co file:///home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/repositories/diff_tests-51 svn-test-work/working_copies/diff_tests-51 --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.071097>
A svn-test-work/working_copies/diff_tests-51/A
A svn-test-work/working_copies/diff_tests-51/A/B
A svn-test-work/working_copies/diff_tests-51/A/B/lambda
A svn-test-work/working_copies/diff_tests-51/A/B/E
A svn-test-work/working_copies/diff_tests-51/A/B/E/alpha
A svn-test-work/working_copies/diff_tests-51/A/B/E/beta
A svn-test-work/working_copies/diff_tests-51/A/B/F
A svn-test-work/working_copies/diff_tests-51/A/mu
A svn-test-work/working_copies/diff_tests-51/A/C
A svn-test-work/working_copies/diff_tests-51/A/D
A svn-test-work/working_copies/diff_tests-51/A/D/gamma
A svn-test-work/working_copies/diff_tests-51/A/D/G
A svn-test-work/working_copies/diff_tests-51/A/D/G/pi
A svn-test-work/working_copies/diff_tests-51/A/D/G/rho
A svn-test-work/working_copies/diff_tests-51/A/D/G/tau
A svn-test-work/working_copies/diff_tests-51/A/D/H
A svn-test-work/working_copies/diff_tests-51/A/D/H/chi
A svn-test-work/working_copies/diff_tests-51/A/D/H/omega
A svn-test-work/working_copies/diff_tests-51/A/D/H/psi
A svn-test-work/working_copies/diff_tests-51/iota
Checked out revision 1.
CMD: svn propset aprop "a prop value" A/B/E/beta --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.028819>
property 'aprop' set on 'A/B/E/beta'
CMD: svn ci -m "log msg" --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.113865>
Sending A/B/E/beta
Committed revision 2.
CMD: svn up --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.039115>
At revision 2.
CMD: svn propdel aprop A/B/E/beta --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.029093>
property 'aprop' deleted from 'A/B/E/beta'.
CMD: svn propset svn:mime-type application/octet-stream iota --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.029719>
property 'svn:mime-type' set on 'iota'
CMD: svn propset newprop "new val" A/B/E/alpha --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.029775>
property 'newprop' set on 'A/B/E/alpha'
CMD: svn add A/T --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.028747>
A A/T
CMD: svn propset dirprop "prop val" A/D/G --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.029177>
property 'dirprop' set on 'A/D/G'
CMD: svn cp A/mu A/T/mumu --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.030740>
A A/T/mumu
CMD: svn rm A/B/lambda --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.030644>
D A/B/lambda
CMD: svn rm A/D/H --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.031473>
D A/D/H/chi
D A/D/H/omega
D A/D/H/psi
D A/D/H
CMD: svn diff --svnpatch --config-dir /home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom <TIME = 0.035463>
Index: A/B/lambda (deleted)
===================================================================
Index: A/B/E/alpha
===================================================================
--- A/B/E/alpha (revision 2)
+++ A/B/E/alpha (working copy)
@@ -1 +1,3 @@
This is the file 'alpha'.
+
+Some more bytes.
Property changes on: A/B/E/alpha
___________________________________________________________________
Added: newprop
+ new val
Property changes on: A/B/E/beta
___________________________________________________________________
Deleted: aprop
- a prop value
Property changes on: A/D/G
___________________________________________________________________
Added: dirprop
+ prop val
Index: iota
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: iota
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
========================= SVNPATCH1 BLOCK =========================
eJyFUl1vgjAU1T36K/omxiFfrUDfXFy2p71o9g70EsiAEqzJ/E37kysWEAViIDfNOaen955WQ7yE
Qq84F0hDNmUmWslPUzBLK7m06E4xslhD2qE7401xsthDAakFxrtiZXH6kjjNoD7DUiIjyMokUCqb
RriRRhk/Qau94tqVGdiYjU0I4uZCJlxIz0VxquFejwwyEKBDIarLzT8L8pAF/XEfto+kUMe072La
jse0Nz4UK4s7bu2Od6Z2f/a9Hza2cMBYr6Vj15LXS6PWNDl5tcjIz/lZiWRuvoSxhCW0mojWn47W
G4fvXlZjhGnK1T2astnIah9nUJbZRRfwK2QKUqA17O3MjtOj5Fz8dApMD99f8yciQmez9cvrE5VN
53/PTsN0fUzSE5K/SABdx1rWMy03i8WB54ByXgEKLwJOm8XADQrWeY3k3A7t2NTCW9P1ScyI7wQh
JozFJLJil7kQ217sTV3GvS+wVDQh/gO/QQ/P
EXPECTED DECODED SVNPATCH:
( open-root ( 2:d0 ) ) ( open-dir ( 1:A 2:d0 2:d1 ) ) ( open-dir ( 3:A/B 2:d1 2:d2 ) ) ( open-dir ( 5:A/B/E 2:d2 2:d3 ) ) ( open-file ( 11:A/B/E/alpha 2:d3 2:c4 ) ) ( change-file-prop ( 2:c4 7:newprop ( 7:new val ) ) ) ( close-file ( 2:c4 ( ) ) ) ( open-file ( 10:A/B/E/beta 2:d3 2:c5 ) ) ( change-file-prop ( 2:c5 5:aprop ( ) ) ) ( close-file ( 2:c5 ( ) ) ) ( close-dir ( 2:d3 ) ) ( delete-entry ( 10:A/B/lambda 2:d2 ) ) ( close-dir ( 2:d2 ) ) ( open-dir ( 3:A/D 2:d1 2:d6 ) ) ( open-dir ( 5:A/D/G 2:d6 2:d7 ) ) ( change-dir-prop ( 2:d7 7:dirprop ( 8:prop val ) ) ) ( close-dir ( 2:d7 ) ) ( delete-entry ( 5:A/D/H 2:d6 ) ) ( close-dir ( 2:d6 ) ) ( add-dir ( 3:A/T 2:d1 2:d8 ( ) ) ) ( add-file ( 8:A/T/mumu 2:d8 2:c9 ( 4:A/mu ) ) ) ( close-file ( 2:c9 ( ) ) ) ( close-dir ( 2:d8 ) ) ( close-dir ( 2:d1 ) ) ( open-file ( 4:iota 2:d0 3:c10 ) ) ( change-file-prop ( 3:c10 13:svn:mime-type ( 24:application/octet-stream ) ) ) ( apply-textdelta ( 3:c10 ( ) ) ) ( textdelta-chunk ( 3:c10 4:SVN ) ) ( textdelta-chunk ( 3:c10 5: +, ) ) ( textdelta-chunk ( 3:c10 2:� ) ) ( textdelta-chunk ( 3:c10 44:+This is the file 'iota'.
Some more bytes.
) ) ( textdelta-end ( 3:c10 ) ) ( close-file ( 3:c10 ( 32:1460795fd593ab45ddf5c1f7d7ef28f8 ) ) ) ( close-dir ( 2:d0 ) ) ( close-edit ( ) )
ACTUAL DECODED SVNPATCH:
( open-root ( 2:d0 ) ) ( open-dir ( 1:A 2:d0 2:d1 ) ) ( open-dir ( 3:A/B 2:d1 2:d2 ) ) ( open-dir ( 5:A/B/E 2:d2 2:d3 ) ) ( open-file ( 11:A/B/E/alpha 2:d3 2:c4 ) ) ( close-file ( 2:c4 ( ) ) ) ( open-file ( 10:A/B/E/beta 2:d3 2:c5 ) ) ( close-file ( 2:c5 ( ) ) ) ( close-dir ( 2:d3 ) ) ( delete-entry ( 10:A/B/lambda 2:d2 ) ) ( close-dir ( 2:d2 ) ) ( open-dir ( 3:A/D 2:d1 2:d6 ) ) ( open-dir ( 5:A/D/G 2:d6 2:d7 ) ) ( close-dir ( 2:d7 ) ) ( delete-entry ( 5:A/D/H 2:d6 ) ) ( close-dir ( 2:d6 ) ) ( add-dir ( 3:A/T 2:d1 2:d8 ( ) ) ) ( add-file ( 8:A/T/mumu 2:d8 2:c9 ( 4:A/mu ) ) ) ( close-file ( 2:c9 ( ) ) ) ( close-dir ( 2:d8 ) ) ( close-dir ( 2:d1 ) ) ( open-file ( 4:iota 2:d0 3:c10 ) ) ( apply-textdelta ( 3:c10 ( ) ) ) ( textdelta-chunk ( 3:c10 4:SVN ) ) ( textdelta-chunk ( 3:c10 5: +, ) ) ( textdelta-chunk ( 3:c10 2:� ) ) ( textdelta-chunk ( 3:c10 44:+This is the file 'iota'.
Some more bytes.
) ) ( textdelta-end ( 3:c10 ) ) ( close-file ( 3:c10 ( 32:1460795fd593ab45ddf5c1f7d7ef28f8 ) ) ) ( close-dir ( 2:d0 ) ) ( close-edit ( ) )
EXCEPTION: SVNUnexpectedStdout: Unexpected svnpatch
Traceback (most recent call last):
File "/home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svntest/main.py", line 1209, in run
rc = self.pred.run(**kw)
File "/home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/svntest/testcase.py", line 121, in run
return self.func(sandbox)
File "/home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/diff_tests.py", line 3172, in diff_svnpatch
verify_svnpatch(svnpatch_output, expected_svnpatch)
File "/home/Arfrever/subversion_svnpatch-diff/subversion/tests/cmdline/diff_tests.py", line 3058, in verify_svnpatch
raise svntest.verify.SVNUnexpectedStdout("Unexpected svnpatch")
SVNUnexpectedStdout: Unexpected svnpatch
FAIL: diff_tests.py 51: test svnpatch format in various ways
END: diff_tests.py
--
Arfrever Frehtes Taifersar Arahesis
Received on 2009-03-02 10:12:39 CET