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

Changeset 1835228 is being indexed.

Correct the diff test added in r1835188.

It failed on Windows, and worked on Linux only because of another bug

('diff --summarize' reporting 'M' even though the copied file was not in

fact modified).

* subversion/tests/cmdline/

(diff_summary_repo_wc_local_copy): Pass the right filename to simple_append().

Fix a crash in diff. 91: Summary diff with a repository source side and a local copy

target side. This particular combination crashed in 1.10.0 and earlier


* subversion/libsvn_client/diff.c

(diff_repos_wc): Ensure 'root_relpath' and 'root_is_dir' outputs are

written in all cases.

* subversion/tests/cmdline/

(diff_summary_repo_wc_local_copy): Remove XFail.

* build/generator/

(TargetJavaClasses.add_dependencies): Reverse check for valid filename to

fail early and avoid an extra level of indentation. No functional change.

Sync merge from publish to staging.
* docs/community-guide/releasing.part.html

(#tarball-signing): Update following r1835191. Correct the number of

required signatures per platform.

Sync merge from publish to staging.
* docs/community-guide/releasing.part.html

(#tarball-signing): Relax the signing restrictions per the dev-list

discussion -

Correct expectations of diff test added in r1835188 (still XFail).

* subversion/tests/cmdline/

(diff_summary_repo_wc_local_copy): Expect 'M' not 'A' for a copied, modified file.

Add a test for a summary-diff case that crashes.

I found this case by code inspection.

* subversion/tests/cmdline/

(diff_summary_repo_wc_local_copy): New test, XFail.

(test_list): Run it.

* subversion/tests/libsvn_repos/authz-test.c

(reposful_reposless_stanzas_inherit): New regression test.

I've manually verified that `svnauthz accessof --repository project1 --path

/foo --username user1 --recursive ./bar` outputs 'rw' in 1.9 and 'no' in trunk,

where 'bar' contains the value of the newly-added variable 'rules'.

Reported by: Michael Ruder


* subversion/libsvn_subr/io.c

(svn_io_dir_walk2): Correct an old comment.

* tools/dist/

(chdir): Add a docstring emphasising that this isn't fchdir(). Not driven so

much by needs of this file as by the likelihood that someone (possibly

future me) will crib this function for use elsewhere.

On the 1.10.x branch: Add r1834835 to r1834612 group (SVN-4758).
On the '1.10.x-issue4758' branch: restore config even on error.

* subversion/libsvn_client/shelve.c

(shelf_write_patch): Don't let an error return leave the client context in

a modified state.

Follow-up to r1834810:

* subversion/tests/cmdline/

Avoid using undefined string escapes, which are deprecated.

* subversion/libsvn_wc/wc_db_wcroot.c

(svn_wc__db_wcroot_parse_local_abspath): Extend use of iterpool, and

destroy it, following r1834812.

* subversion/libsvn_wc/wc_deb_wcroot.c

(svn_wc__db_wcroot_parse_local_abspath) Use an iterpool while trying to find

the abspath of the wcroot

Fix use of implicit path when calling shelf-{list,log,drop} from a wc-subdir

* subversion/svn/shelf-cmd.c:

(svn_cl__shelf_list, svn_cl__shelf_drop, svn_cl__shelf_log): Convert targets

to absolute paths

* subversion/tests/cmdline/

(shelve_unshelve_verify): Add an assertion for "svn shelves"

Correct the use of backslash-space sequence in Python strings.

Python docs state: "Changed in version 3.6: Unrecognized escape sequences

produce a DeprecationWarning. In some future version of Python they will be

a SyntaxError."

Where meant to be a literal string, replace with backslash-backslash-space;

where meant to be a regex, remove the backslash as it is unnecessary in

ordinary regular expressions.

Suggested by: danielsh

* subversion/tests/cmdline/

Double the backslashes in externals definitions.

* subversion/tests/cmdline/

* subversion/tests/cmdline/

* subversion/tests/cmdline/

* subversion/tests/cmdline/

Double the backslashes in "\ No newline at end of..." diff lines.

* subversion/tests/cmdline/

(dump_exclude_all_rev_changes): Remove unnecessary escapes in regexes.

Following r1834628, mark new test as XFail.

* subversion/tests/cmdline/

(patch_empty_prop): Mark as XFail, as this tests a reported bug.

Add a test for 'patch' changing an empty prop val to non-empty.

Bug report: thread "SVN patch issue with property changes" on users@ 2018-06-29 by "Dipu H",

* subversion/tests/cmdline/

(patch_empty_prop): New test.

(test_list): Run it.

On the 1.10.x branch: Nominate r1834612 (SVN-4758: can't shelve with custom diff-cmd).
On the '1.10.x-issue4758' branch: Fix SVN-4758 "Unable to shelve changes

when using custom diff-cmd".

* subversion/libsvn_client/shelve.c

(shelf_write_patch): Ignore any config file while executing the diff, so

as to use the internal diff code.

* subversion/tests/cmdline/


shelve_unshelve): Allow specifying global options.

(shelve_ignores_external_diff): New test.

(test_list): Run it.

Make a branch for issue SVN-4758 'Unable to shelve changes when using

custom diff-cmd'.

* publish/roadmap.html

(next-release-status): Add 'conflict resolver improvements'.

Update the '' redirect to point to the new Wiki.
Update the Subversion web site to point to the new Confluence Wiki.
* publish/roadmap.html

(next-release-status): Update for 1.11; remove stalled wish-list features.

Shelving: tweak top-of-file comments.
* STATUS: Propose HTTP v1 protocol fix.