/[Apache-SVN]
ViewVC logotype

Revision 1875037


Jump to revision: Previous Next
Author: julianfoad
Date: Tue Mar 10 12:16:26 2020 UTC (4 years, 1 month ago)
Changed paths: 16
Log Message:
Merge the 'decouple-shelving-cli' branch to trunk.

Summary:

Add the shelving v2 implementation from Subversion 1.11, as an alternative
to the shelving v3 implementation from Subversion 1.12.

They have substantially different pros and cons, so it is beneficial for the
user to be able to choose.

Make the shelving CLI version selectable by an environment variable:
  env. var. not set                 => shelving v3 enabled
  SVN_EXPERIMENTAL_COMMANDS=shelf3  => shelving v3 enabled
  SVN_EXPERIMENTAL_COMMANDS=shelf2  => shelving v2 enabled
  SVN_EXPERIMENTAL_COMMANDS=        => no shelving CLI



Changed paths

Path Details
Directorysubversion/trunk/ modified , props changed
Directorysubversion/trunk/subversion/include/private/svn_client_private.h modified , text changed
Directorysubversion/trunk/subversion/include/private/svn_client_shelf.h
(Copied from subversion/branches/decouple-shelving-cli/subversion/include/private/svn_client_shelf.h, r1875035)
added
Directorysubversion/trunk/subversion/include/private/svn_client_shelf2.h
(Copied from subversion/branches/decouple-shelving-cli/subversion/include/private/svn_client_shelf2.h, r1875035)
added
Directorysubversion/trunk/subversion/include/svn_client.h modified , text changed
Directorysubversion/trunk/subversion/libsvn_client/diff.c modified , text changed
Directorysubversion/trunk/subversion/libsvn_client/shelf.c modified , text changed
Directorysubversion/trunk/subversion/libsvn_client/shelf2.c
(Copied from subversion/branches/decouple-shelving-cli/subversion/libsvn_client/shelf2.c, r1875035)
added
Directorysubversion/trunk/subversion/libsvn_client/status.c modified , text changed
Directorysubversion/trunk/subversion/svn/cl.h modified , text changed
Directorysubversion/trunk/subversion/svn/shelf-cmd.c modified , text changed
Directorysubversion/trunk/subversion/svn/shelf-cmd.h
(Copied from subversion/branches/decouple-shelving-cli/subversion/svn/shelf-cmd.h, r1875035)
added
Directorysubversion/trunk/subversion/svn/shelf2-cmd.c
(Copied from subversion/branches/decouple-shelving-cli/subversion/svn/shelf2-cmd.c, r1875035)
added
Directorysubversion/trunk/subversion/svn/shelf2-cmd.h
(Copied from subversion/branches/decouple-shelving-cli/subversion/svn/shelf2-cmd.h, r1875035)
added
Directorysubversion/trunk/subversion/svn/svn.c modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/shelf2_tests.py
(Copied from subversion/branches/decouple-shelving-cli/subversion/tests/cmdline/shelf2_tests.py, r1875035)
added

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26