subversion

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

Changeset 1829524 is being indexed.

Temporarily skip a shelving test that is failing on Mac for unknown reason.

[This commit had no effect; the follow-up r1829630 really skips it.]

On the better-pristines branch: Sync with trunk up to r1829346.
    • ?
    /branches/better-pristines/subversion/po/de.po
  1. … 114 more files in changeset.
LZ4 and UTF8PROC are build requirements and so attempts to disable them

via configure options such as --without-lz4 should result in an error.

* build/ac-macros/lz4.m4

(SVN_LZ4): Produce an error if disabled.

* build/ac-macros/utf8proc.m4:

(SVN_UTF8PROC): Produce an error if disabled.

Remove the '1.8.x-sqlite-compatibility-docu' branch, merged in r1829326.
Merge the 1.8.x-sqlite-compatibility-docu branch:

* r1828782

Document build issues with certain SQLite versions using Visual Studio

2005+.

Justification:

Help new users to prevent avoidable build issues.

Branch:

^/subversion/branches/1.8.x-sqlite-compatibility-docu

Votes:

+1: luke1410

* STATUS: Approve documentation fix (doesn't need voting).
Sync merge from publish to staging.
* publish/docs/release-notes/1.10.html:

(ls-search): Add missing colon.

(client-server-improvements): Tweak title slight.

Shelving: start supporting binary files.

Use git diff binary literal format. This works for a stop-gap, but is

inefficient for large files.

* subversion/libsvn_client/shelf.c

(is_binary_file): New.

(walk_callback): Use git binary diff for binary files.

* subversion/tests/cmdline/shelf_tests.py

(shelve_binary_file_mod,

shelve_binary_file_add,

shelve_binary_file_del): Remove 'XFail'.

* STATUS: Vote for r1829241.

Shelving: walk the WC ourself for paths to shelve.

Rather than letting 'diff' do the walking, this prepares for storing binary

files by some method other than diff. It also lets us report unshelvable

paths.

* subversion/libsvn_client/shelf.c

(walk_baton_t, note_shelve, walk_callback, wc_walk_status_multi): New.

(write_patch): Walk the WC ourselves. Report whether we shelved anything

and how many paths we could not shelve.

(svn_client_shelf_save_new_version2): Error if not any paths could not

be shelved.

On the 'shelve-checkpoint' branch: fix wrongly resolved conflict from r1829257.
On the 'shelve-checkpoint' branch: catch up with trunk@1829286.
* subversion/svnadmin/svnadmin.c

(cmd_table): Document use of '--' with the 'freeze' command.

This is a merge of r1828521 from the 'shelve-checkpoint' branch where I

committed it by mistake.

On the 'shelve-checkpoint' branch: catch up with trunk@1829280.
Update issue tracker links in notes, from Tigris (issuezilla) to Apache (Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

Update issue tracker links in comments, from Tigris (issuezilla) to Apache (Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

This is a merge of r1828508 from the 'shelve-checkpoint' branch where I

committed it by mistake.

  1. … 29 more files in changeset.
On the 'shelve-checkpoint' branch: resolve conflicts.
* STATUS: Nominate r1829260.
* build/ac-macros/swig.m4: Revert r1751167, since it broke use of pre-generated

Swig bindings in release builds.

On the 'shelve-checkpoint' branch: catch up with trunk@1829253.
    • ?
    /branches/shelve-checkpoint/subversion/svnlook/svnlook.c
    • ?
    /branches/shelve-checkpoint/build/transform_sql.py
    • ?
    /branches/shelve-checkpoint/subversion/libsvn_wc/props.c
  1. … 135 more files in changeset.
* STATUS: Nominate r1829241.
* configure.ac

Fix variable name with path to rdoc, broken in r1806570.

Found by: Jan Palus <jpalus{_AT_}fastmail.com>

* site: Remove redundant tsvn:projectlanguage SVN property.
* site: Remove redundant tsvn:logwidthmarker SVN property.

Follow-up to r1798731, extend information on KWallet dependencies

INSTALL: add KF5 KWallet details

.: Remove now redundant SVN properties.
* .: Add webviewer:revision SVN property.

* .: Add webviewer:pathrevision SVN property.

* .: Add tsvn:projectlanguage SVN property.