subversion

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

Changeset 1751399 is being indexed.

Update a comment to match r875303 changes.

* subversion/include/svn_types.h: Update the overview comment about

special files to use the new function name in libsvn_subr/subst.c.

In preparation for handling 'add vs add' tree conflicts during update,

rename some symbols in the resolver code to make nomenclature more generic.

* subversion/include/svn_client.h

(svn_client_conflict_option_merge_incoming_added_file_text_merge,

svn_client_conflict_option_merge_incoming_added_file_replace,

svn_client_conflict_option_merge_incoming_added_file_replace_and_merge,

svn_client_conflict_option_merge_incoming_added_dir_merge,

svn_client_conflict_option_merge_incoming_added_dir_replace,

svn_client_conflict_option_merge_incoming_added_dir_replace_and_merge):

Remove _merge_ from symbol names.

(svn_client_conflict_option_incoming_added_file_text_merge,

svn_client_conflict_option_incoming_added_file_replace,

svn_client_conflict_option_incoming_added_file_replace_and_merge,

svn_client_conflict_option_incoming_added_dir_merge,

svn_client_conflict_option_incoming_added_dir_replace,

svn_client_conflict_option_incoming_added_dir_replace_and_merge): New names.

* subversion/libsvn_client/conflicts.c

(configure_option_merge_incoming_add_ignore,

configure_option_merge_incoming_added_file_text_merge,

configure_option_merge_incoming_added_file_replace,

configure_option_merge_incoming_added_file_replace_and_merge,

configure_option_merge_incoming_added_dir_merge,

configure_option_merge_incoming_added_dir_replace,

configure_option_merge_incoming_added_dir_replace_and_merge):

Remove _merge_ from symbol names. Track renamed symbols.

(configure_option_incoming_add_ignore,

configure_option_incoming_added_file_text_merge,

configure_option_incoming_added_file_replace,

configure_option_incoming_added_file_replace_and_merge,

configure_option_incoming_added_dir_merge,

configure_option_incoming_added_dir_replace,

configure_option_incoming_added_dir_replace_and_merge): New names.

(svn_client_conflict_tree_get_resolution_options): Track renames.

* subversion/svn/conflict-callbacks.c

(builtin_resolver_options): Track renames.

* subversion/tests/libsvn_client/conflicts-test.c

(test_merge_incoming_added_file_text_merge,

test_merge_incoming_added_file_replace,

test_merge_incoming_added_file_replace_and_merge,

test_merge_incoming_added_dir_merge,

test_merge_incoming_added_dir_merge2,

test_merge_incoming_added_dir_merge3,

test_merge_incoming_added_dir_replace,

test_merge_incoming_added_dir_replace_and_merge,

test_merge_incoming_added_dir_replace_and_merge2): Track renames.

Merge the r1683266 group from trunk:

* r1683266, r1683267

Avoid possible stack corruption in swig-perl (see also r1683266)

Justification:

These changes go deeper than r1683266 where the possibility that the

Perl stack is re-allocated "from under us" is in plain sight.

They bracket calls to functions svn_swig_pl_make_pool and

svn_swig_pl_callback_thunk that call back into Perl which

meaning that somewhere even further down the call chain

Perl may re-allocate its stack. Note that calling PUTBACK or SPAGAIN

is never wrong, it might just be not necessary (if we can prove that

the cached stack pointer (SP) can't change in between).

Votes:

+1: rschupp, jamessan

Merge the r1663253 group from trunk:

* r1663253, r1704821, r1738659, r1738828

Fix a few instances of undefined behavior in Win32 crash reporter.

Justification:

Potentially crashing in a crash reporter is bad.

Votes:

+1: kotkov, ivan, jamessan

Merge r1741401 from trunk:

* r1741401

Add the OSX 10.11 commercial name for 'svn --version --verbose'.

Justification:

Minor cosmetic change, but it should have been done before the 1.9.0

release since OSX 10.11 was released first.

Votes:

+1: brane, kotkov, jamessan

Merge r1683266 from trunk:

* 1683266

Resolve stack corruption in swig-perl

Justification:

User requested fix. Breaks git's svn clone support in some

use-cases. See

http://www.mail-archive.com/git@vger.kernel.org/msg97227.html

Votes:

+0: rhuijben

+1: stsp

+1: rschupp

Merge r1683266 from trunk:

* r1683266

Resolve stack corruption in swig-perl

Justification:

User requested fix. Breaks git's svn clone support in some

use-cases. See

http://www.mail-archive.com/git@vger.kernel.org/msg97227.html

Votes:

+1: rschupp, stsp

* build/ac-macros/swig.m4:

(SVN_FIND_SWIG): Configure the swig bindings only if swig has been enabled.

[Note from the future; reverted in r1829260]

* STATUS:

Vote +1 on r1741401, approving.

Vote +1 on the r1663253 group, approving.

Vote +1 on the r1745515 group.

Vote +1 on r1748514.

Vote +1 on the r1683266 group, approving.

* STATUS (for 1.8.x): Vote for r1683266, approving.

- nominate r1683266

- vote for r1683266

- nominate r1683266, r1683267

* STATUS: Move r1683266 to approved section

one +1 vote and one +0 vote suffice for binding changes

* publish/packages.html: some HTML fixes
* STATUS: Vote for r1683266.

* STATUS: Nominate swig-perl fix.
* publish/packages.html: update SUSE, add openSUSE
Follow-up to r1750770.

* publish/packages.html: Remove UTF-8 BOM signature.

* publish/packages.html: Use https:// for links to HTTPS-only sites.

* site/publish/faq.html

(dav-slow-copy): Correct "fix version" of this problem (1.8.11 -> 1.8.14).

Also mention that the fix was in mod_dav_svn, to make it clear that

it's not a client-side fix.

* site/publish/faq.html

(why): Give a short definition of "what", and add a link to "Quick Start"

* site/publish/faq.html

(interop): Point out that feature limitations because of version

interoperability are documented in the release notes.

* site/publish/faq.html

(readonly): Move this question to the BDB Questions under the Deprecated FAQ

* site/publish/faq.html

(stable): Rephrase question and first paragraph of the answer to be a bit

more contemporary.

* site/publish/faq.html

(why): Rephrase the question a bit, to include "What is Subversion?"

* site/publish/faq.html

(collab): Generalize this question to simply "Is Subversion proprietary

software?". Make it no longer call out CollabNet only (but still mention

several companies (those that come to my mind at this time), in case

they would ring a bell for someone reading the question / answer).

FAQ: Generalize the question on Daylight Savings Time (DST)

* site/publish/faq.html

(dst-2007): Remove mention of 2007, and just speak about DST in general.

Suggested by: rhuijben

FAQ: move BDB questions to Deprecated FAQ.

* site/publish/faq.html

(bdb-questions): New section in Deprecated FAQ.

(divining-bdb-version,

bdblogs,

stuck-bdb-repos,

bdb-recovery,

bdb-cannot-allocate-memory,

db3db4,

redhat-db,

bdb41-tabletype-bug,

bdb43-upgrade): Move these questions to the bdb-questions section.

Introduce a "Deprecated FAQ" section on our FAQ page, and move one

question over there.

* site/publish/faq.html

(Deprecated FAQ): New section

(windows-xp-server): Move to Deprecated FAQ

Raise a malfunction instead of segfaulting due to a null pointer dereference

with a corrupted wc.db

Found by: TortoiseSVN dump

* subversion/libsvn_wc/wc_db.c

(db_read_repos_info): Raise malfunction if WORK_DEL_RELPATH and

BASE_DEL_RELPATH are null. We have the same check in get_info_for_copy().