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

Changeset 873634 is being indexed.

On the issue-2843-dev branch: bring almost-up-to-date with trunk.

I ran:

svn merge

This was when latest trunk was actually r33554. But due to r33536,

attempts to merge the very latest trunk would end early with this


subversion/libsvn_ra_neon/util.c:545: (apr_err=160013)

svn: '/repos/svn/!svn/bc/33554/branches/issue-2843-dev/tools/\

buildbot/slaves/win32-xp-VS2005' path not found

subversion/libsvn_ra_neon/util.c:1243: (apr_err=175002)

svn: Error reading spooled REPORT request response

So I'm working around it by taking this one step at a time. The first

step is this merge, which brings us up to r33535. I've also left two

files conflicted, so that the conflict resolution can be a separate

commit immediately following this one. They are:



(The README resolution is trivial, and the update_editor.c resolution

probably so, but I want it to be a separate commit just in case.)

  1. … 532 more files in changeset.
On the issue-2843-dev branch.

Merged from trunk r31940:r32487.

  1. … 243 more files in changeset.