You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/03/05 20:40:28 UTC
svn commit: r1664460 - in /subversion/branches/1.9.x: ./ STATUS
subversion/svn/info-cmd.c subversion/svn/svn.c
subversion/tests/cmdline/info_tests.py
Author: svn-role
Date: Thu Mar 5 19:40:28 2015
New Revision: 1664460
URL: http://svn.apache.org/r1664460
Log:
Merge r1663003 from trunk:
* r1663003
info --show-item: Change 'last-changed-rev' to 'last-changed-revision'.
Justification (for being a freeze exception):
API change.
Justification (general):
Longer-hand spelling is clearer and more self-explanatory.
Notes:
API change (can't be merged after 1.9.0).
Votes:
+1: danielsh, brane, rhuijben
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svn/info-cmd.c
subversion/branches/1.9.x/subversion/svn/svn.c
subversion/branches/1.9.x/subversion/tests/cmdline/info_tests.py
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 5 19:40:28 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1664460&r1=1664459&r2=1664460&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 5 19:40:28 2015
@@ -142,17 +142,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1663003
- info --show-item: Change 'last-changed-rev' to 'last-changed-revision'.
- Justification (for being a freeze exception):
- API change.
- Justification (general):
- Longer-hand spelling is clearer and more self-explanatory.
- Notes:
- API change (can't be merged after 1.9.0).
- Votes:
- +1: danielsh, brane, rhuijben
-
* r1663697, r1663706, r1663749
Set svn:date earlier when creating a BDB txn.
Justification:
Modified: subversion/branches/1.9.x/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svn/info-cmd.c?rev=1664460&r1=1664459&r2=1664460&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svn/info-cmd.c (original)
+++ subversion/branches/1.9.x/subversion/svn/info-cmd.c Thu Mar 5 19:40:28 2015
@@ -129,7 +129,8 @@ static const info_item_map_t info_item_m
{ MAKE_STRING("repos-root-url"), info_item_repos_root_url },
{ MAKE_STRING("repos-uuid"), info_item_repos_uuid },
{ MAKE_STRING("revision"), info_item_revision },
- { MAKE_STRING("last-changed-rev"), info_item_last_changed_rev },
+ { MAKE_STRING("last-changed-revision"),
+ info_item_last_changed_rev },
{ MAKE_STRING("last-changed-date"), info_item_last_changed_date },
{ MAKE_STRING("last-changed-author"), info_item_last_changed_author },
{ MAKE_STRING("wc-root"), info_item_wc_root }
Modified: subversion/branches/1.9.x/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svn/svn.c?rev=1664460&r1=1664459&r2=1664460&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.9.x/subversion/svn/svn.c Thu Mar 5 19:40:28 2015
@@ -750,7 +750,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" repos-uuid the repository UUID\n"
" revision the revision of TARGET (defaults to BASE\n"
" for working copy paths and HEAD for URLs)\n"
- " last-changed-rev the most recent revision in which TARGET\n"
+ " last-changed-revision the most recent revision in which TARGET\n"
" was changed\n"
" last-changed-date the date of the last-changed revision\n"
" last-changed-author the author of the last-changed revision\n"
Modified: subversion/branches/1.9.x/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/info_tests.py?rev=1664460&r1=1664459&r2=1664460&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/branches/1.9.x/subversion/tests/cmdline/info_tests.py Thu Mar 5 19:40:28 2015
@@ -658,7 +658,7 @@ def info_item_simple_multiple(sbox):
svntest.actions.run_and_verify_svn(
r'^1\s+\S+(/|\\)info_tests-\d+(/|\\)[^/\\]+$', [],
- 'info', '--show-item=last-changed-rev',
+ 'info', '--show-item=last-changed-revision',
sbox.ospath('A'), sbox.ospath('iota'))
@@ -669,13 +669,13 @@ def info_item_url(sbox):
svntest.actions.run_and_verify_svn(
'1', [],
- 'info', '--show-item=last-changed-rev',
+ 'info', '--show-item=last-changed-revision',
sbox.repo_url)
svntest.actions.run_and_verify_svn(
r'^1\s+[^/:]+://.+/repos/[^/]+$', [],
- 'info', '--show-item=last-changed-rev',
+ 'info', '--show-item=last-changed-revision',
sbox.repo_url + '/A', sbox.repo_url + '/iota')
@@ -697,7 +697,7 @@ def info_item_uncommmitted(sbox):
svntest.actions.run_and_verify_svn(
'', [],
- 'info', '--show-item=last-changed-rev',
+ 'info', '--show-item=last-changed-revision',
sbox.ospath('newfile'))
svntest.actions.run_and_verify_svn(