subversion

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

Changeset 1857385 is being indexed.

* staging/docs/release-notes/1.12.html

(issues): Mention the APR 1.7.0 build problem.

publish: merge from staging
* staging/docs/release-notes/1.12.html

(conflict-resolver): Document improved support for unversioned items.

publish: merge from staging

* staging/docs/release-notes/1.12.html: Document more client- and server-side

changes, based on items in the CHANGES file.

* publish: merge from staging

* staging/docs/release-notes/1.12.html

(conflict-resolver): Document resolver features added for 1.12.

* STATUS: Nominate r1857367.

* STATUS: Nominate r1857367.

* STATUS: Nominate r1857367.

Fix memory lifetime problem in a libsvn_wc error code path.

* subversion/libsvn_wc/wc_db_update_move.c

(suitable_for_move): Calling svn_sqlite__column_text() with a NULL result

pool twice means the result of the first call becomes invalid. Store the

child_relpath variable in a pool. It is passed to path_for_error_message()

later, after another call to svn_sqlite__column_text() with a NULL result

pool has already occurred.

Crash observed on OpenBSD:

#0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:125

#1 0x00000c38d5de6db7 in svn_dirent_join (

base=0xc38dfe1ef00 "/home/stsp/svn/svn-1.12.0/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_update_subtree",

component=0xc390ca94fc8 '\337' <repeats 55 times>, <incomplete sequence \337><error: Cannot access memory at address 0xc390ca95000>, pool=0xc38eeceff00)

at subversion/libsvn_subr/dirent_uri.c:1007

#2 0x00000c38f686a815 in path_for_error_message (wcroot=0xc387ee3d300,

local_relpath=0xc390ca94fc8 '\337' <repeats 55 times>, <incomplete sequence \337><error: Cannot access memory at address 0xc390ca95000>,

result_pool=0xc38eeceff00) at subversion/libsvn_wc/wc_db_update_move.c:167

#3 0x00000c38f686ad1f in suitable_for_move (wcroot=0xc387ee3d300,

local_relpath=0xc387efe4ce0 "A/B", scratch_pool=0xc38eeceff00)

at subversion/libsvn_wc/wc_db_update_move.c:2192

Post-release housekeeping: bump the 1.12.x branch to 1.12.1.
Tagging release 1.12.0
    • ?
    /tags/1.12.0/subversion/include/svn_version.h
On the '1.12.x' branch: sync 'CHANGES' from trunk.
Add a release date for 1.12.0.
* STATUS: Nominate VS2019 support.
* STATUS: Nominate VS2019 support.
Add support for generating Microsoft Visual Studio 2019 project files.

* build/generator/gen_win_dependencies.py

(parse_options): Add magic numbers for Visual Studio 2019.

* publish/docs/community-guide/releasing.part.html: Revert mistaken r1855211.^M^MThanks to danielsh for pointing it out.
* STATUS: Nominate r1855419.

* STATUS: Nominate r1855419.

Create 1.11.x backport branch for r1855419.

* STATUS: Nominate r1855419.

Create 1.10.x backport branch for r1855419.

Fix conflict resolver bug where local and incoming edits got swapped.

When auto-resolving an incoming file move vs local file edit tree

conflict after an update or switch operation, text conflicts were

created with the incoming changes (theirs) and local changes (mine)

swapped within text conflict markers. When such a text conflict was

then resolved with the --accept mf/mc/tf/tc options the result was

the opposite of what it should have been.

Reported by: Jonathan Guy

* subversion/libsvn_client/conflicts.c

(resolve_incoming_move_file_text_merge): After update/switch, run the

text merge in a way that makes local and incoming changes properly

land on their respective sides of a text conflict.

Announce Subversion 1.12.0-rc1
* publish/docs/community-guide/releasing.part.html:

Don't use reporter.apache.org for pre-releases.

* docs/release-notes/1.12.html

(github-issue): Remove. Issue was resolved by Github end of December 2018.

* upcoming.part.html: Automatically regenerated
Merge r1853761 from trunk:

* r1853761

Fix an "unused static function" warning in non-maintainer mode builds.

Justification:

Requested on dev@. Fixes a compiler warning.

Votes:

+1: danielsh, brane, stsp