Author: danielsh
Date: Tue Mar 8 14:08:08 2022
New Revision: 1898733
URL: http://svn.apache.org/viewvc?rev=1898733&view=rev
Log:
On the pristines-on-demand-on-mwf branch, cherry-pick r1898732 from trunk.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1898732
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py?rev=1898733&r1=1898732&r2=1898733&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
Tue Mar 8 14:08:08 2022
@@ -430,11 +430,10 @@ def basic_update_corruption(sbox):
##
## 1. Make a working copy at rev 1, duplicate it. Now we have
## two working copies at rev 1. Call them first and second.
- ## 2. Make a local mod to `first/A/mu'.
- ## 3. Repair the text-base, commit again, expect success.
- ## 4. Intentionally corrupt `second/A/.svn/text-base/mu.svn-base'.
- ## 5. Try to update `second', expect failure.
- ## 6. Repair the text-base, update again, expect success.
+ ## 2. Make a local mod to `first/A/mu' and commit it.
+ ## 3. Intentionally corrupt `second/A/.svn/text-base/mu.svn-base'.
+ ## 4. Try to update `second', expect failure.
+ ## 5. Repair the text-base, update again, expect success.
##
## Here we go...
