Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1800383 is being indexed.

On the 1.8.x branch, merge r1745515 and r1746364 from trunk.

* r1745515, r1746364

Update serf download URIs to ASF.

Justification:

Resolves build script issues since the old google code URI is 404 now.

Notes:

Merge with --accept=working due to absence of

tools/dev/build-svn-deps-win.pl on the 1.8 branch.

Votes:

+1: stefan2, stsp

-0: rhuijben (Makefile.svn is patched but not fixed)

-0 (non-binding): luke1410 (r1700130 is missing - will have to create a

backport branch)

  1. … 3 more files in changeset.
* STATUS (1.8.x): Vote for the r1745515 group.

Note the Bert: Anyone using Makefile.svn (if at all) should use the

trunk version, so actually fixing it on the branch is not necessary.

Reintegrate the 1.8.x-r1785053 branch:

* r1785053

Never attempt to share directory representations in FSFS.

Justification:

This fixes inconsistent behavior. We never add dir reps to the rep-

cache but would happily share any file or prop rep that happens to

match the respective directory rep.

Branch:

^/subversion/branches/1.8.x-r1785053

Notes:

Will create a text conflict with the strict-rep-sharing patches.

Depending on which change gets merged first, the respective other

needs to be updated.

Votes:

+1: stefan2, rhuijben, stsp

  1. … 3 more files in changeset.
* STATUS: Vote for 1.8.x-r1785053 branch, approving.

* STATUS: Update vote. Note problem.
* STATUS: Extend vote.
On the 1.8.x branch, merge r1759116.

* r1759116

Work around an APR bug in svn_io_file_trunc with buffered r/w files.

Justification:

Without this patch, trunc() will leave buffered file objects with

alternating read and write accesses in an inconsistent state. Apart

from being a bug in one of our public APIs, this will cause corruptions

in FSFS when the strict-rep-sharing patches get backported.

Votes:

+1: stefan2, rhuijben, stsp

  1. … 4 more files in changeset.
On the 1.8.x branch:

* STATUS: Vote for r1759116, approving. Needs 1.9 client to merge cleanly.

* STATUS:

Add r1794611 to the strict-rep-sharing group.

* STATUS: Cast vote.
* STATUS: Following up on r1787764 use right branch revisions for 1.9.x->1.8.x.
[Revert r1787783]
  1. … 4 more files in changeset.
[Accidental commit of r1787785, combined with nominated change.

Reverted in 1787784]

  1. … 4 more files in changeset.
* STATUS: Cast two votes.
* STATUS: Following up on r1787654, fix two branchnames.
* STATUS:

Nominate r1759116 (trunc fix)

Nominate r1785053 (no dir rep sharing)

Nominate r1785737 group (strict rep sharing)

Post-release housekeeping: bump the 1.8.x branch to 1.8.18.
  1. … 1 more file in changeset.
* STATUS: Remove comment accidentally left after r1770609.
Merge the 1.8.x-issue4658 branch:

* r1766352, r1766590

Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS

Justification:

Prevents access to committed data. This is as close to a corruption one

could get without actually corrupting anything. User reported issue.

Branch:

^/subversion/branches/1.8.x-issue4658

Notes:

r1766352 contains the actual fix.

r1766590 adds a test case for it.

Votes:

+1: stefan2, stsp, brane

+0: rhuijben

  1. … 4 more files in changeset.
Merge the 1.8.x-r1724448 branch:

* r1724448, r1770355

Fix handling of newly secured subdirectories in a working copy

Justification:

Regression against <= 1.6.x. Without this patch a directory that

(still) exists locally but to which a user has no access is handled as

a local obstruction on the next update that brings a change to this tree

and the local working copy state is broken. This patch handles the

incomming change as a delete, properly marking a tree conflict if

necessary, allowing a user to make a copy of local changes.

(Committing a copy would be hard though... as the user most likely

doesn't have the rights to copy from what is now hidden).

Branch:

^/subversion/branches/1.8.x-r1724448

Notes:

r1770355 fixes a test failure specific to the backport branch.

Votes:

+1: stsp, stefan2, brane

+1: rhuijben (without r1770355)

  1. … 4 more files in changeset.
Merge the 1.8.x-portability branch:

* r1722860, r1722879, r1722887

Memory access portability issues.

Justification:

Not complying to the C standard is bad. At the very least we

improve the signal/noise ratio when using memory sanitizers.

Part of this patch set (r1722879) fixes a crash on SPARC that

apparently gets masked by some lucky caller pattern.

Finally, these changes make the code actually simpler.

Notes:

r1722860 fixes the issue originally reported on dev@.

r1722879 fixes a follow-up issue found by the SPARC buildbot.

r1722887 removes similar logic from the membuffer cache although

that had not been reported a faulty.

Branch:

^/subversion/branches/1.8.x-portability

Votes:

+1: stefan2, stsp

+1: brane, however: [[[

subversion/libsvn_subr/utf_validate.c:273:28: warning: comparison of constant 128 with expression

of type 'const char' is always false [-Wtautological-constant-out-of-range-compare]

if (*data < 0 || *data >= 0x80)

~~~~~ ^ ~~~~

This is happily not exactly a bug because the '< 0' branch will

catch these cases, but it's really messy ...]]]

  1. … 5 more files in changeset.
Merge the r1717875 group from trunk:

* r1717875, r1717878

Make inherited property api consistent over all ra layers

Justification:

Our ra implementations should follow the documentation... and should

be as consistent as possible between each other. Only because the

caller uses svn_path_url_add_component2() this wasn't noticed by

our code.

Notes:

A test for this issue was added in r1717874, but requires plumbing

that isn't available on 1.8.x

Votes:

+1: rhuijben, stefan2, brane

  1. … 4 more files in changeset.
Merge the 1.8.x-issue4557 branch:

* r1663500

Fix issue #4557, "ra_serf fails to delete directory containing many files"

Justification:

Regression introduced in 1.8.10.

Notes:

The associated test is still failing because it was extended to check

COPY as well as DELETE. Issue #4557 is just about DELETE requests.

Branch:

^/subversion/branches/1.8.x-issue4557

Votes:

+1: stsp, stefan2, brane

  1. … 4 more files in changeset.
* branches/1.8.x/STATUS: Approve the r1717875 group.
* branches/1.8.x/STATUS: Approve the r1663500 group.
* branches/1.8.x/STATUS: Almost veto the r1722860 group but approve

it anyway on the grounds that yuck != bug.

* branches/1.8.x/STATUS,

branches/1.9.x/STATUS: Veto r1701488 as invalid: contrib/ is not part of our releases.

  1. … 1 more file in changeset.
* branches/1.8.x/STATUS: Remove veto and approve the r1724448 group. Approve the r1766352 group.
* STATUS

Withdraw veto from r1724448 group after the fix and +1 it.

* STATUS: Add a note that vetos were cast before r1770355.