On 10/13/2016 11:08 AM, Stefan wrote: > On 10/10/2016 11:39 PM, Stefan wrote: >> On 10/10/2016 6:12 PM, Ivan Zhakov wrote: >>> On 10 October 2016 at 17:53, Stefan <luke1...@posteo.de> wrote: >>>> On 8/28/2016 11:32 PM, Bert Huijben wrote: >>>>>> -----Original Message----- >>>>>> From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] >>>>>> Sent: zondag 28 augustus 2016 20:23 >>>>>> To: Stefan <luke1...@posteo.de> >>>>>> Cc: dev@subversion.apache.org >>>>>> Subject: Re: [PATCH] Fix a conflict resolution issue related to binary >>>>>> files (patch >>>>>> v4) >>>>>> >>>>>> Stefan wrote on Sun, Aug 28, 2016 at 13:31:39 +0200: >>>>>>> The regression test was tested against 1.9.4, 1.9.x and trunk r1743999. >>>>>>> >>>>>>> I also tried to run the test against 1.8.16 but there it fails (didn't >>>>>>> investigate in detail). >>>>>>> Trunk r1758069 caused some build issues on my machine. Therefore I >>>>>>> couldn't validate/check the patch against the latest trunk (maybe it's >>>>>>> just some local issue with my build machine rather than some actual >>>>>>> problem on trunk - didn't look into that yet). >>>>>> For future reference, you might have tried building trunk@HEAD after >>>>>> locally reverting r1758069; i.e.: >>>>>> >>>>>> svn up >>>>>> svn merge -c -r1758069 >>>>>> <apply patch> >>>>>> make check >>>>>> >>>>>> Stefan wrote on Sun, Aug 28, 2016 at 18:33:55 +0200: >>>>>>> Got approved by Bert. >>>>>>> >>>>>> (Thanks for stating so on the thread.) >>>>>> >>>>>>> Separated the repro test from the actual fix in order to have the >>>>>>> possibility to selectively only backport the regression test to the 1.8 >>>>>>> branch. >>>>>> Good call, but the fix and the "remove XFail markers" (r1758129 and >>>>>> r1758130) should have been done in a single revision: they _are_ >>>>>> a single logical change. That would also avoid breaking 'make check' >>>>>> (at r1758129 'make check' exits non-zero because of the XPASS). >>>>> I do this the same way sometimes, when I want to use the separate >>>>> revision for backporting... But usually I commit things close enough that >>>>> nobody notices the bot results ;-) >>>>> (While the initial XFail addition is still running, you can commit the >>>>> two follow ups, and the buildbots collapses all the changes to a single >>>>> build) >>>>> >>>>> I just committed the followup patch posted in another thread to unbreak >>>>> the bots for the night... >>>>> >>>>> Bert >>>> Attached is a patch which should resolve the test case you added, Bert. >>>> Anybody feels like approving it? Or is there something I should >>>> improve/change? >>>> >>>> [[[ >>>> >>>> Add support for the svn_client_conflict_option_working_text resolution for >>>> binary file conflicts. >>>> >>>> * subversion/libsvn_client/conflicts.c >>>> (): Add svn_client_conflict_option_working_text to >>>> binary_conflict_options >>>> >>>> * subversion/tests/cmdline/resolve_tests.py >>>> (automatic_binary_conflict_resolution): Remove XFail marker >>>> >>>> ]]] >>>> >>> It seems this patch breaks interactive conflict resolve: >>> With trunk I get the following to 'svn resolve' on binary file: >>> [[[ >>> Merge conflict discovered in binary file 'A_COPY\theta'. >>> Select: (p) postpone, >>> (r) accept binary file as it appears in the working copy, >>> (tf) accept incoming version of binary file: h >>> >>> (p) - skip this conflict and leave it unresolved [postpone] >>> (tf) - accept incoming version of binary file [theirs-full] >>> (r) - accept binary file as it appears in the working copy [working] >>> (q) - postpone all remaining conflicts >>> ]]] >>> >>> But with patch I get the following: >>> [[[ >>> Merge conflict discovered in binary file 'A_COPY\theta'. >>> Select: (p) postpone, >>> (r) accept binary file as it appears in the working copy, >>> (tf) accept incoming version of binary file: h >>> >>> (p) - skip this conflict and leave it unresolved [postpone] >>> (tf) - accept incoming version of binary file [theirs-full] >>> (mf) - accept binary file as it appears in the working copy [mine-full] >>> (r) - accept binary file as it appears in the working copy [working] >>> (q) - postpone all remaining conflicts >>> ]]] >>> >>> I think it's confusing and we should not offer the same option twice. >>> >> Completely agreed. The display of the option in the UI shouldn't be like >> that. Certainly an oversight on my side. Will revise the patch and come >> up with a different/better approach tomorrow. >> >> Regards, >> Stefan > Trying to put together a revised patch without the issue. The attached > patch fixes the 4647 test but breaks two other tests: > > basic#41 > update#38 > > Still looking into what I'm doing wrong, but any pointers would be much > appreciated.
Looks like update#38 is actually fixed. Leaving basic#41 broken: FAIL: basic_tests.py 41: automatic conflict resolution Attached is the full test output. Regards, Stefan
same: C:\Projects\MaxSVN\dependencies\openssl\out32dll\libeay32.dll and: C:\Projects\MaxSVN\trunk\Release\libeay32.dll same: C:\Projects\MaxSVN\dependencies\httpd\bin\libapr-1.dll and: C:\Projects\MaxSVN\trunk\Release\libapr-1.dll same: C:\Projects\MaxSVN\dependencies\httpd\bin\apr_dbd_odbc-1.dll and: C:\Projects\MaxSVN\trunk\Release\apr_dbd_odbc-1.dll same: C:\Projects\MaxSVN\dependencies\httpd\bin\apr_ldap-1.dll and: C:\Projects\MaxSVN\trunk\Release\apr_ldap-1.dll same: C:\Projects\MaxSVN\dependencies\openssl\out32dll\ssleay32.dll and: C:\Projects\MaxSVN\trunk\Release\ssleay32.dll same: C:\Projects\MaxSVN\dependencies\httpd\srclib\apr-util\bin\libaprutil-1.dll and: C:\Projects\MaxSVN\trunk\Release\libaprutil-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_client/libsvn_client-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_client-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_diff/libsvn_diff-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_diff-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_ra/libsvn_ra-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_ra-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_wc/libsvn_wc-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_wc-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_delta/libsvn_delta-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_delta-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_fs_fs/libsvn_fs_fs-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_fs_fs-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_fs_util/libsvn_fs_util-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_fs_util-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_fs_x/libsvn_fs_x-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_fs_x-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_subr/libsvn_subr-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_subr-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_fs/libsvn_fs-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_fs-1.dll same: C:\Projects\MaxSVN\trunk\Release\subversion/libsvn_repos/libsvn_repos-1.dll and: C:\Projects\MaxSVN\trunk\Release\libsvn_repos-1.dll Testing Release configuration on local repository. START: basic_tests.py I: CMD: svnadmin.exe create svn-test-work\local_tmp\repos --compatible-version=1.10 --fs-type=fsfs I: <TIME = 0.060000> I: CMD: svn.exe import -m "Log message for revision 1." svn-test-work\local_tmp\greekfiles file:///C:/Projects/MaxSVN/trunk/Release/subversion/tests/cmdline/svn-test-work/local_tmp/repos --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.290000> I: Adding svn-test-work\local_tmp\greekfiles\A I: Adding svn-test-work\local_tmp\greekfiles\A\B I: Adding svn-test-work\local_tmp\greekfiles\A\B\E I: Adding svn-test-work\local_tmp\greekfiles\A\B\E\alpha I: Adding svn-test-work\local_tmp\greekfiles\A\B\E\beta I: Adding svn-test-work\local_tmp\greekfiles\A\B\F I: Adding svn-test-work\local_tmp\greekfiles\A\B\lambda I: Adding svn-test-work\local_tmp\greekfiles\A\C I: Adding svn-test-work\local_tmp\greekfiles\A\D I: Adding svn-test-work\local_tmp\greekfiles\A\D\G I: Adding svn-test-work\local_tmp\greekfiles\A\D\G\pi I: Adding svn-test-work\local_tmp\greekfiles\A\D\G\rho I: Adding svn-test-work\local_tmp\greekfiles\A\D\G\tau I: Adding svn-test-work\local_tmp\greekfiles\A\D\H I: Adding svn-test-work\local_tmp\greekfiles\A\D\H\chi I: Adding svn-test-work\local_tmp\greekfiles\A\D\H\omega I: Adding svn-test-work\local_tmp\greekfiles\A\D\H\psi I: Adding svn-test-work\local_tmp\greekfiles\A\D\gamma I: Adding svn-test-work\local_tmp\greekfiles\A\mu I: Adding svn-test-work\local_tmp\greekfiles\iota I: Committing transaction... I: Committed revision 1. I: CMD: svnadmin.exe create svn-test-work\repositories\basic_tests-41 --compatible-version=1.10 --fs-type=fsfs I: <TIME = 0.190000> I: CMD: svnadmin.exe dump svn-test-work\local_tmp\repos | svnadmin.exe load svn-test-work\repositories\basic_tests-41 --ignore-uuid I: <TIME = 0.304000> I: CMD: svnadmin.exe setuuid svn-test-work\repositories\basic_tests-41 I: <TIME = 0.028000> I: CMD: svn.exe co file:///C:/Projects/MaxSVN/trunk/Release/subversion/tests/cmdline/svn-test-work/repositories/basic_tests-41 svn-test-work\working_copies\basic_tests-41 --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.309000> I: A svn-test-work\working_copies\basic_tests-41\A I: A svn-test-work\working_copies\basic_tests-41\A\B I: A svn-test-work\working_copies\basic_tests-41\A\B\E I: A svn-test-work\working_copies\basic_tests-41\A\B\E\alpha I: A svn-test-work\working_copies\basic_tests-41\A\B\E\beta I: A svn-test-work\working_copies\basic_tests-41\A\B\F I: A svn-test-work\working_copies\basic_tests-41\A\B\lambda I: A svn-test-work\working_copies\basic_tests-41\A\C I: A svn-test-work\working_copies\basic_tests-41\A\D I: A svn-test-work\working_copies\basic_tests-41\A\D\G I: A svn-test-work\working_copies\basic_tests-41\A\D\G\pi I: A svn-test-work\working_copies\basic_tests-41\A\D\G\rho I: A svn-test-work\working_copies\basic_tests-41\A\D\G\tau I: A svn-test-work\working_copies\basic_tests-41\A\D\H I: A svn-test-work\working_copies\basic_tests-41\A\D\H\chi I: A svn-test-work\working_copies\basic_tests-41\A\D\H\omega I: A svn-test-work\working_copies\basic_tests-41\A\D\H\psi I: A svn-test-work\working_copies\basic_tests-41\A\D\gamma I: A svn-test-work\working_copies\basic_tests-41\A\mu I: A svn-test-work\working_copies\basic_tests-41\iota I: Checked out revision 1. I: CMD: svn.exe ci svn-test-work\working_copies\basic_tests-41 -m "log msg" --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.338000> I: Sending svn-test-work\working_copies\basic_tests-41\A\B\lambda I: Sending svn-test-work\working_copies\basic_tests-41\A\D\G\rho I: Sending svn-test-work\working_copies\basic_tests-41\A\D\G\tau I: Sending svn-test-work\working_copies\basic_tests-41\A\D\H\omega I: Sending svn-test-work\working_copies\basic_tests-41\A\mu I: Transmitting file data .....done I: Committing transaction... I: Committed revision 2. I: CMD: svn.exe status -v -u -q svn-test-work\working_copies\basic_tests-41 --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.180000> I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\G\pi I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41\A\D\G\rho I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41\A\D\G\tau I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\G I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\H\psi I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\H\chi I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41\A\D\H\omega I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\H I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D\gamma I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\D I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\B\E\alpha I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\B\E\beta I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\B\E I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\B\F I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41\A\B\lambda I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\B I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41\A\mu I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A\C I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\A I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41\iota I: 1 1 jrandom svn-test-work\working_copies\basic_tests-41 I: Status against revision: 2 I: CMD: entries-dump.exe --tree-dump svn-test-work\working_copies\basic_tests-41 I: CMD: svn.exe up svn-test-work\working_copies\basic_tests-41.backup --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.350000> I: Updating 'svn-test-work\working_copies\basic_tests-41.backup': I: C svn-test-work\working_copies\basic_tests-41.backup\A\B\lambda I: C svn-test-work\working_copies\basic_tests-41.backup\A\D\G\rho I: C svn-test-work\working_copies\basic_tests-41.backup\A\D\G\tau I: C svn-test-work\working_copies\basic_tests-41.backup\A\D\H\omega I: C svn-test-work\working_copies\basic_tests-41.backup\A\mu I: Updated to revision 2. I: Summary of conflicts: I: Text conflicts: 5 I: CMD: svn.exe status -v -u -q svn-test-work\working_copies\basic_tests-41.backup --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.060000> I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\iota I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B\E I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B\E\alpha I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B\E\beta I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B\F I: C 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\B\lambda I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\C I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\G I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\G\pi I: C 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\G\rho I: C 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\G\tau I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\H I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\H\chi I: C 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\H\omega I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\H\psi I: 2 1 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\D\gamma I: C 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A\mu I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup\A I: 2 2 jrandom svn-test-work\working_copies\basic_tests-41.backup I: Status against revision: 2 I: CMD: entries-dump.exe --tree-dump svn-test-work\working_copies\basic_tests-41.backup I: CMD: svn.exe resolve --accept=postpone --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: CMD: C:\Projects\MaxSVN\trunk\Release\subversion\svn/svn.exe resolve --accept=postpone --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom exited with 1 I: <TIME = 0.030000> I: svn: E205000: Try 'svn help resolve' for more information I: svn: E205000: invalid 'accept' ARG I: CMD: svn.exe resolve --accept=edit --force-interactive --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: CMD: C:\Projects\MaxSVN\trunk\Release\subversion\svn/svn.exe resolve --accept=edit --force-interactive --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom exited with 1 I: <TIME = 0.033000> I: svn: E205000: Try 'svn help resolve' for more information I: svn: E205000: invalid 'accept' ARG I: CMD: svn.exe resolve --accept=launch --force-interactive --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: CMD: C:\Projects\MaxSVN\trunk\Release\subversion\svn/svn.exe resolve --accept=launch --force-interactive --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom exited with 1 I: <TIME = 0.026000> I: svn: E205000: Try 'svn help resolve' for more information I: svn: E205000: invalid 'accept' ARG I: CMD: svn.exe resolve --accept=NOPE svn-test-work\working_copies\basic_tests-41.backup\A\D\H\omega --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: CMD: C:\Projects\MaxSVN\trunk\Release\subversion\svn/svn.exe resolve --accept=NOPE svn-test-work\working_copies\basic_tests-41.backup\A\D\H\omega --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom exited with 1 I: <TIME = 0.140000> I: svn: E205000: 'NOPE' is not a valid --accept value I: CMD: svn.exe resolve --accept=base svn-test-work\working_copies\basic_tests-41.backup\A\B\lambda --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.040000> I: Merge conflicts in 'svn-test-work\working_copies\basic_tests-41.backup\A\B\lambda' marked as resolved. I: CMD: svn.exe resolve --accept=mine-full svn-test-work\working_copies\basic_tests-41.backup\A\mu --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.172000> I: Merge conflicts in 'svn-test-work\working_copies\basic_tests-41.backup\A\mu' marked as resolved. I: CMD: svn.exe resolve --accept=theirs-full svn-test-work\working_copies\basic_tests-41.backup\A\D\G\rho --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.039000> I: Merge conflicts in 'svn-test-work\working_copies\basic_tests-41.backup\A\D\G\rho' marked as resolved. I: CMD: svn.exe resolve --accept=working svn-test-work\working_copies\basic_tests-41.backup\A\D\G\tau --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.183000> I: Merge conflicts in 'svn-test-work\working_copies\basic_tests-41.backup\A\D\G\tau' marked as resolved. I: CMD: svn.exe up svn-test-work\working_copies\basic_tests-41.backup --config-dir C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline\svn-test-work\local_tmp\config --password rayjandom --no-auth-cache --username jrandom I: <TIME = 0.187000> I: Updating 'svn-test-work\working_copies\basic_tests-41.backup': I: At revision 2. W: ============================================================= Expected 'tau' and actual 'tau' in disk tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: tau Path: __SVN_ROOT_NODE\A\D\G\tau Contents: Resolution text for 'tau'. Properties: {} Attributes: {} Children: None (node is probably a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: tau Path: A\D\G\tau Contents: This is the file 'tau'. Conflicting appended text for tau Properties: {} Attributes: {} Children: None (node is probably a file) W: Unequal at node tau W: Unequal at node G W: Unequal at node D W: Unequal at node A W: EXPECTED DISK TREE: svntest.wc.State(wc_dir, { 'A/B/E/beta' : Item(contents="This is the file 'beta'.\n"), 'A/B/E/alpha' : Item(contents="This is the file 'alpha'.\n"), 'A/B/F' : Item(), 'A/B/lambda' : Item(contents="This is the file 'lambda'.\n"), 'A/D/G/rho' : Item(contents="This is the file 'rho'.\nOriginal appended text for rho\n"), 'A/D/G/pi' : Item(contents="This is the file 'pi'.\n"), 'A/D/G/tau' : Item(contents="Resolution text for 'tau'.\n"), 'A/D/H/psi' : Item(contents="This is the file 'psi'.\n"), 'A/D/H/omega' : Item(contents="This is the file 'omega'.\n<<<<<<< .mine\nConflicting appended text for omega\n||||||| .r1\n=======\nOriginal appended text for omega\n>>>>>>> .r2\n"), 'A/D/H/chi' : Item(contents="This is the file 'chi'.\n"), 'A/D/gamma' : Item(contents="This is the file 'gamma'.\n"), 'A/mu' : Item(contents="This is the file 'mu'.\nConflicting appended text for mu\n"), 'A/C' : Item(), 'iota' : Item(contents="This is the file 'iota'.\n"), }) W: ACTUAL DISK TREE: svntest.wc.State(wc_dir, { 'A/D/G/tau' : Item(contents="This is the file 'tau'.\nConflicting appended text for tau\n"), 'A/D/G/rho' : Item(contents="This is the file 'rho'.\nOriginal appended text for rho\n"), 'A/D/G/pi' : Item(contents="This is the file 'pi'.\n"), 'A/D/H/chi' : Item(contents="This is the file 'chi'.\n"), 'A/D/H/omega.mine' : Item(contents="This is the file 'omega'.\nConflicting appended text for omega\n"), 'A/D/H/omega.r1' : Item(contents="This is the file 'omega'.\n"), 'A/D/H/omega.r2' : Item(contents="This is the file 'omega'.\nOriginal appended text for omega\n"), 'A/D/H/psi' : Item(contents="This is the file 'psi'.\n"), 'A/D/H/omega' : Item(contents="This is the file 'omega'.\n<<<<<<< .mine\nConflicting appended text for omega\n||||||| .r1\n=======\nOriginal appended text for omega\n>>>>>>> .r2\n"), 'A/D/gamma' : Item(contents="This is the file 'gamma'.\n"), 'A/mu' : Item(contents="This is the file 'mu'.\nConflicting appended text for mu\n"), 'A/B/lambda' : Item(contents="This is the file 'lambda'.\n"), 'A/B/E/beta' : Item(contents="This is the file 'beta'.\n"), 'A/B/E/alpha' : Item(contents="This is the file 'alpha'.\n"), 'A/B/F' : Item(), 'A/C' : Item(), 'iota' : Item(contents="This is the file 'iota'.\n"), }) W: CWD: C:\Projects\MaxSVN\trunk\Release\subversion\tests\cmdline W: EXCEPTION: SVNTreeUnequal Traceback (most recent call last): File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\main.py", line 1852, in run rc = self.pred.run(sandbox) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\testcase.py", line 178, in run result = self.func(sandbox) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\basic_tests.py", line 2362, in automatic_conflict_resolution extra_files=extra_files) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py", line 933, in run_and_verify_update *args, **kw) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py", line 976, in run_and_verify_update2 check_props, keep_eol_style=keep_eol_style, **kw) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py", line 875, in verify_update extra_files, keep_eol_style) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\actions.py", line 912, in verify_disk singleton_handler_b, b_baton) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\tree.py", line 696, in compare_trees singleton_handler_b, b_baton) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\tree.py", line 696, in compare_trees singleton_handler_b, b_baton) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\tree.py", line 696, in compare_trees singleton_handler_b, b_baton) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\tree.py", line 696, in compare_trees singleton_handler_b, b_baton) File "C:\Projects\MaxSVN\trunk\subversion\tests\cmdline\svntest\tree.py", line 672, in compare_trees raise SVNTreeUnequal SVNTreeUnequal FAIL: basic_tests.py 41: automatic conflict resolution END: basic_tests.py ELAPSED: basic_tests.py 0:00:03.578000 Summary of test results: SUMMARY: Some tests failed.
smime.p7s
Description: S/MIME Cryptographic Signature