Author: brane
Date: Tue Feb 17 15:36:20 2015
New Revision: 1660418
URL: http://svn.apache.org/r1660418
Log:
Merge the removal of 'svn youngest' from the svn-info-detail branch.
* subversion/svn/cl.h
(svn_cl__youngest): Remove declaration.
* subversion/svn/youngest-cmd.c: Removed file.
(svn_cl__youngest): Gone.
* subversion/svn/svn.c
(svn_cl__cmd_table): Remove the definition of the 'svn youngest' subcommand.
* subversion/tests/cmdline/basic_tests.py
(basic_youngest): Removed.
(test_list): Removed entry for basic_youngest.
* subversion/tests/cmdline/getopt_tests_data/svn--help_stdout,
subversion/tests/cmdline/getopt_tests_data/svn_help_stdout:
Adjust expected output for getopt_tests.py.
* tools/client-side/bash_completion
(_svn): Remove youngest.
Removed:
subversion/trunk/subversion/svn/youngest-cmd.c
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/trunk/tools/client-side/bash_completion
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 15:36:20 2015
@@ -70,6 +70,7 @@
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-auth-x509:1603509-1655900
+/subversion/branches/svn-info-detail:1660035-1660413
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements:918519-934609
/subversion/branches/svn_mutex:1141683-1182099
Modified: subversion/trunk/subversion/svn/cl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Tue Feb 17 15:36:20 2015
@@ -297,8 +297,7 @@ svn_opt_subcommand_t
svn_cl__switch,
svn_cl__unlock,
svn_cl__update,
- svn_cl__upgrade,
- svn_cl__youngest;
+ svn_cl__upgrade;
/* See definition in svn.c for documentation. */
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Feb 17 15:36:20 2015
@@ -1723,14 +1723,6 @@ const svn_opt_subcommand_desc2_t svn_cl_
" Local modifications are preserved.\n"),
{ 'q' } },
- { "youngest", svn_cl__youngest, {0}, N_
- ("Print the youngest revision number of a target's repository.\n"
- "usage: youngest [TARGET]\n"
- "\n"
- " Print the revision number of the youngest revision in the repository\n"
- " with which TARGET is associated.\n"),
- { opt_no_newline } },
-
{ NULL, NULL, {0}, NULL, {0} }
};
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Tue Feb 17
15:36:20 2015
@@ -3083,32 +3083,6 @@ def peg_rev_on_non_existent_wc_path(sbox
'cat', '-r2', sbox.ospath('mu3') + '@3')
-@Issue(4299)
-def basic_youngest(sbox):
- 'basic youngest'
-
- sbox.build(read_only=True)
-
- repos_url = sbox.repo_url
- deep_repos_url = repos_url + '/A/D/G'
-
- wc_dir = sbox.wc_dir
- deep_wc_dir = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
- bad_wc_dir = os.path.join(wc_dir, 'Z')
-
- svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
- 'youngest', bad_wc_dir)
-
- for flag, output in [(False, "1\n"), (True, "1")]:
- for path in [repos_url, deep_repos_url, wc_dir, deep_wc_dir]:
- if flag:
- svntest.actions.run_and_verify_svn([output], [],
- 'youngest', '--no-newline', path)
- else:
- svntest.actions.run_and_verify_svn([output], [],
- 'youngest', path)
-
-
# With 'svn mkdir --parents' the target directory may already exist on disk.
# In that case it was wrongly performing a recursive 'add' on its contents.
def mkdir_parents_target_exists_on_disk(sbox):
@@ -3202,7 +3176,6 @@ test_list = [ None,
rm_missing_with_case_clashing_ondisk_item,
delete_conflicts_one_of_many,
peg_rev_on_non_existent_wc_path,
- basic_youngest,
mkdir_parents_target_exists_on_disk,
]
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
(original)
+++
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
Tue Feb 17 15:36:20 2015
@@ -46,7 +46,6 @@ Available subcommands:
unlock
update (up)
upgrade
- youngest
Subversion is a tool for version control.
For additional information, see http://subversion.apache.org/
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
(original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
Tue Feb 17 15:36:20 2015
@@ -46,7 +46,6 @@ Available subcommands:
unlock
update (up)
upgrade
- youngest
Subversion is a tool for version control.
For additional information, see http://subversion.apache.org/
Modified: subversion/trunk/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/bash_completion?rev=1660418&r1=1660417&r2=1660418&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/bash_completion (original)
+++ subversion/trunk/tools/client-side/bash_completion Tue Feb 17 15:36:20 2015
@@ -167,7 +167,7 @@ _svn()
cmds="$cmds info list ls lock log merge mergeinfo mkdir move mv rename"
cmds="$cmds patch propdel pdel propedit pedit propget pget proplist"
cmds="$cmds plist propset pset relocate resolve resolved revert status"
- cmds="$cmds switch unlock update upgrade youngest"
+ cmds="$cmds switch unlock update upgrade"
# help options have a strange command status...
local helpOpts='--help -h'
@@ -955,9 +955,6 @@ _svn()
upgrade)
cmdOpts="$qOpts $pOpts"
;;
- youngest)
- cmdOpts="$pOpts --no-newline"
- ;;
*)
;;
esac
