Author: stsp
Date: Mon Jul 25 14:13:42 2011
New Revision: 1150713
URL: http://svn.apache.org/viewvc?rev=1150713view=rev
Log:
On the gpg-agent-password-store branch:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Mark a couple of local variables 'const'.
Modified
Author: stsp
Date: Mon Jul 25 14:24:53 2011
New Revision: 1150716
URL: http://svn.apache.org/viewvc?rev=1150716view=rev
Log:
On the gpg-agent-password-store branch, ensure that messages are always
read in their entirety from the agent's socket.
The GPG-Agent protocol terminates messages
Author: stsp
Date: Mon Jul 25 14:28:55 2011
New Revision: 1150720
URL: http://svn.apache.org/viewvc?rev=1150720view=rev
Log:
On the gpg-agent-password-store branch, ensure that the gpg-agent socket
is always closed.
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Close
Author: stsp
Date: Mon Jul 25 14:33:32 2011
New Revision: 1150723
URL: http://svn.apache.org/viewvc?rev=1150723view=rev
Log:
On the gpg-agent-password-store branch, send the values of the LC_CTYPE
and DISPLAY variables to gpg-agent. These might be useful for the pinentry
program.
* subversion
Author: stsp
Date: Mon Jul 25 14:45:59 2011
New Revision: 1150728
URL: http://svn.apache.org/viewvc?rev=1150728view=rev
Log:
On the gpg-agent-password-store branch, improve the pinentry program's prompt.
Put the name of the authentication realm into the prompt.
Change the password prompt
Author: stsp
Date: Mon Jul 25 14:47:34 2011
New Revision: 1150729
URL: http://svn.apache.org/viewvc?rev=1150729view=rev
Log:
On the gpg-agent-password-store branch, avoid a potential NULL-derefernce.
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Do not crash
Modified:
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/adm_crawler.c
URL:
http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/adm_crawler.c?rev=1150751r1=1150750r2=1150751view=diff
Modified:
subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_client/client-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_client/client-test.c?rev=1150751r1=1150750r2=1150751view=diff
Author: stsp
Date: Mon Jul 25 15:54:54 2011
New Revision: 1150760
URL: http://svn.apache.org/viewvc?rev=1150760view=rev
Log:
On the gpg-agent-password-store branch, remerge (that is, reverse-merge
and then merge again) r1146165, r1146496, r1146501. For some reason the
right set of changes
Author: stsp
Date: Mon Jul 25 15:58:20 2011
New Revision: 1150762
URL: http://svn.apache.org/viewvc?rev=1150762view=rev
Log:
For some reason, when r1144381 was merged into the gpg-agent-password-store
branch, the file subversion/tests/cmdline/svnmucc_tests.py didn't get added.
So do this now
Author: stsp
Date: Mon Jul 25 17:14:15 2011
New Revision: 1150783
URL: http://svn.apache.org/viewvc?rev=1150783view=rev
Log:
Reintegrate the gpg-agent-password-store branch.
It is now working quite well. Further cleanup can happen on trunk.
The merge was an interesting experience. In addition
Author: stsp
Date: Mon Jul 25 17:18:33 2011
New Revision: 1150789
URL: http://svn.apache.org/viewvc?rev=1150789view=rev
Log:
* subversion/include/svn_auth.h
(svn_auth_gpg_agent_version): Add @since tag.
(svn_auth_get_gpg_agent_simple_provider): Fix @since tag.
Modified:
subversion/trunk
Author: stsp
Date: Mon Jul 25 17:43:18 2011
New Revision: 1150801
URL: http://svn.apache.org/viewvc?rev=1150801view=rev
Log:
Some refactoring in the gpg-agent code. No functional change.
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(send_option): New helper function that sends an option
Author: stsp
Date: Mon Jul 25 17:45:07 2011
New Revision: 1150803
URL: http://svn.apache.org/viewvc?rev=1150803view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Do not ignore errors thrown by the send() function.
Modified:
subversion/trunk/subversion
Author: stsp
Date: Mon Jul 25 17:48:52 2011
New Revision: 1150807
URL: http://svn.apache.org/viewvc?rev=1150807view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(send_option, password_get_gpg_agent): Use write() instead of send().
We don't set any flags for send() so we might
Author: stsp
Date: Mon Jul 25 18:36:16 2011
New Revision: 1150833
URL: http://svn.apache.org/viewvc?rev=1150833view=rev
Log:
Small cleanups related to the new gpg-agent feature. No functional change.
* subversion/include/svn_auth.h
(svn_auth_get_platform_specific_provider
Author: stsp
Date: Mon Jul 25 18:45:57 2011
New Revision: 1150841
URL: http://svn.apache.org/viewvc?rev=1150841view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): We can pass the full BUFFER_SIZE to
receive_from_gpg_agent() and send_option() because
Author: stsp
Date: Mon Jul 25 20:00:58 2011
New Revision: 1150870
URL: http://svn.apache.org/viewvc?rev=1150870view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Write the correct number of bytes to the
socket when sending the GET_PASSPHRASE command. We
Author: stsp
Date: Mon Jul 25 20:07:30 2011
New Revision: 1150875
URL: http://svn.apache.org/viewvc?rev=1150875view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Verify that the agent shares our idea about
which socket we used to connect to the agent
Author: stsp
Date: Mon Jul 25 20:24:17 2011
New Revision: 1150884
URL: http://svn.apache.org/viewvc?rev=1150884view=rev
Log:
* subversion/libsvn_auth_gpg_agent/gpg_agent.c
(password_get_gpg_agent): Reinitialise local variable P to NULL before
using it a second time.
Found by: danielsh
Author: stsp
Date: Mon Jul 25 23:00:20 2011
New Revision: 1150950
URL: http://svn.apache.org/viewvc?rev=1150950view=rev
Log:
Remove libsvn_auth_gpg_agent and move gpg-agent support into libsvn_subr.
There is no need to put gpg-agent support into a library loaded at runtime.
The svn code talks
Author: stsp
Date: Mon Jul 25 23:07:56 2011
New Revision: 1150952
URL: http://svn.apache.org/viewvc?rev=1150952view=rev
Log:
* subversion/libsvn_subr/gpg_agent.c: Wrap everything in this file
within #ifndef WIN32 to avoid build problems on Windows.
Modified:
subversion/trunk/subversion
Author: stsp
Date: Mon Jul 25 23:25:39 2011
New Revision: 1150954
URL: http://svn.apache.org/viewvc?rev=1150954view=rev
Log:
Move gpg-agent behind GNOME Keyring, Kwallet, and Keychain, by default.
We don't want to disturb existing setups that use existing password
caching mechanisms on *NIX
Author: stsp
Date: Tue Jul 26 08:24:17 2011
New Revision: 1151015
URL: http://svn.apache.org/viewvc?rev=1151015view=rev
Log:
* subversion/tests/cmdline/info_tests.py
(info_show_exclude): Fix indentation and put the expected error string
into a variable instead of spelling it out twice
Author: stsp
Date: Tue Jul 26 09:26:41 2011
New Revision: 1151036
URL: http://svn.apache.org/viewvc?rev=1151036view=rev
Log:
* subversion/po/de.po: Fix an error in the German translation of the help
text of 'svn export'. The text was implying that unversioned files
were exported under some
Author: stsp
Date: Tue Jul 26 09:28:37 2011
New Revision: 1151037
URL: http://svn.apache.org/viewvc?rev=1151037view=rev
Log:
On the 1.7.x branch, merge r1151036 from trunk (obvious fix).
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/subversion/po/de.po
Author: stsp
Date: Tue Jul 26 09:29:47 2011
New Revision: 1151038
URL: http://svn.apache.org/viewvc?rev=1151038view=rev
Log:
On the 1.6.x branch, merge r1151036 from trunk (obvious fix).
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/subversion/po/de.po
Author: stsp
Date: Tue Jul 26 09:37:27 2011
New Revision: 1151041
URL: http://svn.apache.org/viewvc?rev=1151041view=rev
Log:
* STATUS: Vote for r1150812.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Tue Jul 26 09:45:40 2011
New Revision: 1151044
URL: http://svn.apache.org/viewvc?rev=1151044view=rev
Log:
* subversion/libsvn_wc/info.c
(build_info_for_entry): Remove obsolete comment line. The code
pertaining to this was removed in r1132455.
Patch by: Noorul Islam K M
Author: stsp
Date: Tue Jul 26 10:19:55 2011
New Revision: 1151053
URL: http://svn.apache.org/viewvc?rev=1151053view=rev
Log:
* subversion/libsvn_subr/auth.c,
subversion/libsvn_subr/gpg_agent.c: As per our coding style guidelines,
change space-before-paren formatting to no-space-before-paren
Author: stsp
Date: Tue Jul 26 12:09:32 2011
New Revision: 1151068
URL: http://svn.apache.org/viewvc?rev=1151068view=rev
Log:
* subversion/libsvn_subr/cmdline.c
(svn_cmdline_create_auth_baton): Convert 'space-before-paren' formatting
to 'no-space-before-paren' as per our coding style
Author: stsp
Date: Tue Jul 26 12:11:05 2011
New Revision: 1151069
URL: http://svn.apache.org/viewvc?rev=1151069view=rev
Log:
* subversion/libsvn_subr/gpg_agent.c: Add a comment that explains how this
auth cache provider operates, including security considerations.
Modified:
subversion
Author: stsp
Date: Tue Jul 26 12:25:27 2011
New Revision: 1151073
URL: http://svn.apache.org/viewvc?rev=1151073view=rev
Log:
* subversion/libsvn_subr/gpg_agent.c
(password_set_gpg_agent): Fix typo in comment.
(simple_gpg_agent_first_creds): Add docstring.
simple_gpg_agent_save_creds
Author: stsp
Revision: 1150870
Modified property: svn:log
Modified: svn:log at Tue Jul 26 12:30:13 2011
--
--- svn:log (original)
+++ svn:log Tue Jul 26 12:30:13 2011
@@ -1,5 +1,5 @@
* subversion/libsvn_auth_gpg_agent
Author: stsp
Revision: 1150728
Modified property: svn:log
Modified: svn:log at Tue Jul 26 12:31:33 2011
--
--- svn:log (original)
+++ svn:log Tue Jul 26 12:31:33 2011
@@ -5,9 +5,9 @@ Change the password prompt to match
Author: stsp
Revision: 1150841
Modified property: svn:log
Modified: svn:log at Tue Jul 26 12:34:58 2011
--
--- svn:log (original)
+++ svn:log Tue Jul 26 12:34:58 2011
@@ -1,7 +1,7 @@
* subversion/libsvn_auth_gpg_agent
Author: stsp
Date: Tue Jul 26 16:51:23 2011
New Revision: 1151166
URL: http://svn.apache.org/viewvc?rev=1151166view=rev
Log:
Record moved-to information at the delete-half of a move.
* subversion/include/private/svn_wc_private.h
(svn_wc__delete_internal): Declare.
* subversion/libsvn_wc
Author: stsp
Date: Tue Jul 26 21:45:36 2011
New Revision: 1151260
URL: http://svn.apache.org/viewvc?rev=1151260view=rev
Log:
Rename the new_revert_* functions to just revert_*. It is confusing
to have functions called new_something when the old implementation
is already obsolete (as of r1088811
Author: stsp
Date: Wed Jul 27 09:00:50 2011
New Revision: 1151390
URL: http://svn.apache.org/viewvc?rev=1151390view=rev
Log:
* site/publish/index.html: Fix link to 1.7 release notes.
Found by: Karl Heinz Marbaise
Modified:
subversion/site/publish/index.html
Modified: subversion/site/publish
Author: stsp
Revision: 1151590
Modified property: svn:log
Modified: svn:log at Wed Jul 27 19:03:48 2011
--
--- svn:log (original)
+++ svn:log Wed Jul 27 19:03:48 2011
@@ -1,4 +1,4 @@
-Make svn_wc__db_scan_addition
Author: stsp
Date: Thu Jul 28 10:11:43 2011
New Revision: 1151780
URL: http://svn.apache.org/viewvc?rev=1151780view=rev
Log:
Make the wc_db internal scan_addition() function return moved-from
information as relative paths, rather than absolute paths. This makes
it easier for other internal
Author: stsp
Date: Thu Jul 28 12:48:58 2011
New Revision: 1151824
URL: http://svn.apache.org/viewvc?rev=1151824view=rev
Log:
Record correct moved-from information for nodes which are moved multiple times.
The sequence svn mv A B; svn mv B C; ended up incorrectly recording
C moved-from B. It must
Author: stsp
Date: Thu Jul 28 17:07:16 2011
New Revision: 1151927
URL: http://svn.apache.org/viewvc?rev=1151927view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(scan_addition_txn): Rename the confusingly named local variable
CURRENT_RELPATH, which always contains the relpath of the op_root
Author: stsp
Date: Thu Jul 28 17:51:08 2011
New Revision: 1151939
URL: http://svn.apache.org/viewvc?rev=1151939view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(op_delete_txn): Remove local variable IS_VALID_MOVED_TO_RELPATH which
I added in r1151824 but should have just left out. Its name
Author: stsp
Date: Thu Jul 28 18:13:31 2011
New Revision: 1151951
URL: http://svn.apache.org/viewvc?rev=1151951view=rev
Log:
Add new libsvn_wc API function svn_wc__node_was_moved_here() which
determines whether a node at a given LOCAL_ABSPATH was moved to this path.
This will be used later
Author: stsp
Date: Thu Jul 28 18:36:37 2011
New Revision: 1151960
URL: http://svn.apache.org/viewvc?rev=1151960view=rev
Log:
* site/publish/roadmap.html: Note that improved local move support is
work-in-progress for 1.8.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion
Author: stsp
Date: Thu Jul 28 18:40:56 2011
New Revision: 1151962
URL: http://svn.apache.org/viewvc?rev=1151962view=rev
Log:
* notes/moves: Mention number of the issue which corresponds to this.
Modified:
subversion/trunk/notes/moves
Modified: subversion/trunk/notes/moves
URL:
http
Author: stsp
Date: Thu Jul 28 18:44:35 2011
New Revision: 1151965
URL: http://svn.apache.org/viewvc?rev=1151965view=rev
Log:
* site/publish/roadmap.html: Add a note to GPG-Agent entry in 1.8 table.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
Author: stsp
Date: Thu Jul 28 18:45:36 2011
New Revision: 1151966
URL: http://svn.apache.org/viewvc?rev=1151966view=rev
Log:
* site/publish/roadmap.html: Fix typo from r1151965.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
URL:
http
Author: stsp
Date: Thu Jul 28 18:51:06 2011
New Revision: 1151970
URL: http://svn.apache.org/viewvc?rev=1151970view=rev
Log:
* site/public/roadmap.html: Add conflict-storage to 1.8 items (not-started).
Let's hope we'll get to it in this release cycle.
Modified:
subversion/site/publish
Author: stsp
Date: Thu Jul 28 18:52:55 2011
New Revision: 1151971
URL: http://svn.apache.org/viewvc?rev=1151971view=rev
Log:
* publish/roadmap.html: - amp;
Found by: danielsh
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
URL:
http
Author: stsp
Date: Thu Jul 28 22:27:14 2011
New Revision: 1152023
URL: http://svn.apache.org/viewvc?rev=1152023view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_scan_addition): Do not dereference MOVED_FROM_RELPATH
and DELETE_OP_ROOT_RELPATH if scan_deletion() set them to NULL
Author: stsp
Date: Thu Jul 28 22:35:57 2011
New Revision: 1152026
URL: http://svn.apache.org/viewvc?rev=1152026view=rev
Log:
Make commit refuse to commit the copied-half of a move independently of
the delete-half.
It is still possible to commit the delete-half independently of the
copied-half
Author: stsp
Revision: 1152115
Modified property: svn:log
Modified: svn:log at Fri Jul 29 09:42:46 2011
--
--- svn:log (original)
+++ svn:log Fri Jul 29 09:42:46 2011
@@ -1,7 +1,6 @@
Add a couple of tests in followup
Author: stsp
Date: Fri Jul 29 09:55:26 2011
New Revision: 1152153
URL: http://svn.apache.org/viewvc?rev=1152153view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(commit_copied_half_of_move, commit_deleted_half_of_move): Add issue number.
Modified:
subversion/trunk/subversion/tests
Author: stsp
Date: Fri Jul 29 10:07:20 2011
New Revision: 1152154
URL: http://svn.apache.org/viewvc?rev=1152154view=rev
Log:
* STATUS: Vote for r1152129.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Jul 29 13:12:39 2011
New Revision: 1152204
URL: http://svn.apache.org/viewvc?rev=1152204view=rev
Log:
Add a new internal API function: svn_wc__node_get_deleted_ancestor().
This will be needed for handling moves during commit processing.
* subversion/include/private
Author: stsp
Date: Fri Jul 29 14:48:18 2011
New Revision: 1152245
URL: http://svn.apache.org/viewvc?rev=1152245view=rev
Log:
Update moved-to information on the BASE path of a node which is being moved
out of, or within, an existing moved subtree. Also, make 'svn commit' deal
with the add-half
Author: stsp
Date: Fri Jul 29 14:50:25 2011
New Revision: 1152246
URL: http://svn.apache.org/viewvc?rev=1152246view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(commit_deleted_half_of_nested_move, test_list): New XFail test which
shows a case where recording of moved-to information
Author: stsp
Date: Fri Jul 29 16:25:06 2011
New Revision: 1152293
URL: http://svn.apache.org/viewvc?rev=1152293view=rev
Log:
Fix the problem that prevented copy_test 106 (nested moves) from passing.
* subversion/libsvn_wc/wc_db.c
(op_delete_txn): If a subtree is being moved-away, update moved
Author: stsp
Date: Fri Jul 29 16:28:11 2011
New Revision: 1152294
URL: http://svn.apache.org/viewvc?rev=1152294view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(op_delete_txn): Add a debug assertion that fails if a move has been
recorded incorrectly.
Modified:
subversion/trunk/subversion
Author: stsp
Date: Fri Jul 29 16:53:01 2011
New Revision: 1152300
URL: http://svn.apache.org/viewvc?rev=1152300view=rev
Log:
Temporarily revert r1152293 and r1152294. r1152293 is causing test failures.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk
Author: stsp
Date: Fri Jul 29 17:46:16 2011
New Revision: 1152324
URL: http://svn.apache.org/viewvc?rev=1152324view=rev
Log:
Restore the changes from r1152293 (which see for log full message),
including the following fix:
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_MOVED_HERE_CHILDREN
Author: stsp
Date: Fri Jul 29 17:48:18 2011
New Revision: 1152326
URL: http://svn.apache.org/viewvc?rev=1152326view=rev
Log:
Restore r1152294 (which see for full log message) unchanged.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc
Author: stsp
Revision: 1152324
Modified property: svn:log
Modified: svn:log at Fri Jul 29 17:48:58 2011
--
--- svn:log (original)
+++ svn:log Fri Jul 29 17:48:58 2011
@@ -1,4 +1,4 @@
-Restore the changes from r1152293
Author: stsp
Date: Fri Jul 29 18:19:24 2011
New Revision: 1152332
URL: http://svn.apache.org/viewvc?rev=1152332view=rev
Log:
Follow-up to r1152294:
* subversion/libsvn_wc/wc_db.c: Use #ifdef SVN_DEBUG, not #if SVN_DEBUG.
Found by: danielsh
Modified:
subversion/trunk/subversion/libsvn_wc
Author: stsp
Revision: 1152326
Modified property: svn:log
Modified: svn:log at Fri Jul 29 18:58:06 2011
--
--- svn:log (original)
+++ svn:log Fri Jul 29 18:58:06 2011
@@ -1 +1,2 @@
-Restore r1152294 (which see for full
Author: stsp
Date: Fri Jul 29 19:33:13 2011
New Revision: 1152345
URL: http://svn.apache.org/viewvc?rev=1152345view=rev
Log:
Extend svn_wc__db_scan_deletion() to return the moved-to path of
of a moved node, if requested, in MOVED_TO_ABSPATH.
This function already returned the op-root
Author: stsp
Date: Fri Jul 29 19:35:45 2011
New Revision: 1152348
URL: http://svn.apache.org/viewvc?rev=1152348view=rev
Log:
Whoops, revert the just-committed r1152345, it wasn't quite ready yet.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion
Author: stsp
Date: Fri Jul 29 20:15:00 2011
New Revision: 1152364
URL: http://svn.apache.org/viewvc?rev=1152364view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(op_delete_txn): Always initialise local variables MOVED_FROM_RELPATH,
CHILED_MOVED_FROM_RELPATH, and CHILD_DELETE_OP_ROOT_RELPATH
Author: stsp
Date: Fri Jul 29 20:36:13 2011
New Revision: 1152368
URL: http://svn.apache.org/viewvc?rev=1152368view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(op_delete_txn): Reset open SQLite statements when returning errors
that aren't coming from the svn_sqlite__ API.
Found by: rhuijben
Author: stsp
Date: Sat Jul 30 09:22:14 2011
New Revision: 1152436
URL: http://svn.apache.org/viewvc?rev=1152436view=rev
Log:
Fixed version of the change originally committed in r1152345 and
reverted again in r1152348:
Extend svn_wc__db_scan_deletion() to return the moved-to path of
of a moved
Author: stsp
Revision: 1152345
Modified property: svn:log
Modified: svn:log at Sat Jul 30 09:24:16 2011
--
--- svn:log (original)
+++ svn:log Sat Jul 30 09:24:16 2011
@@ -1,3 +1,6 @@
+[ Note from the future: This change
Author: stsp
Date: Sat Jul 30 10:47:39 2011
New Revision: 1152447
URL: http://svn.apache.org/viewvc?rev=1152447view=rev
Log:
Add a new libsvn_wc API function: svn_wc__node_was_moved_away().
* subversion/include/private/svn_wc_private.h
(svn_wc__node_was_moved_away): Declare.
* subversion
Author: stsp
Date: Sat Jul 30 10:52:20 2011
New Revision: 1152449
URL: http://svn.apache.org/viewvc?rev=1152449view=rev
Log:
Make commit refuse to commit the delete-half of a move separately from
the copied-half.
* subversion/libsvn_client/commit.c
(svn_client_commit5): If a deleted commit
Author: stsp
Date: Mon Aug 8 10:32:54 2011
New Revision: 1154908
URL: http://svn.apache.org/viewvc?rev=1154908view=rev
Log:
* subversion/bindings/swig/ruby/test/util.rb
(setup_svnserve): Wait more time for svnserve to gets its marbles together.
I've started getting spurious test failures
Author: stsp
Date: Mon Aug 8 10:34:58 2011
New Revision: 1154909
URL: http://svn.apache.org/viewvc?rev=1154909view=rev
Log:
* STATUS: Nominate r1154908.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Mon Aug 8 10:50:16 2011
New Revision: 1154913
URL: http://svn.apache.org/viewvc?rev=1154913view=rev
Log:
* tools/dev/unix-build/Makefile.svn
(svn-check-swig-rb): Do not reproduce code from Subversion's own Makefile
here. Run the provided 'check-swig-rb' target instead
Author: stsp
Date: Mon Aug 8 12:11:06 2011
New Revision: 1154938
URL: http://svn.apache.org/viewvc?rev=1154938view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(commit_copied_half_of_move, commit_deleted_half_of_move): Verify moved-to
and moved-from paths shown in error messages
Author: stsp
Date: Mon Aug 8 12:54:28 2011
New Revision: 1154946
URL: http://svn.apache.org/viewvc?rev=1154946view=rev
Log:
Merge two copy tests which were partly overlapping.
* subversion/tests/cmdline/copy_tests.py
(commit_copied_half_of_nested_move): Remove, and merge
Author: stsp
Date: Mon Aug 8 13:05:37 2011
New Revision: 1154948
URL: http://svn.apache.org/viewvc?rev=1154948view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(commit_deleted_half_of_move): Cover the case where the delete-half of
a move is picked up via recursion. Use sbox.ospath
Author: stsp
Date: Mon Aug 8 16:02:41 2011
New Revision: 1155000
URL: http://svn.apache.org/viewvc?rev=1155000view=rev
Log:
Fix problems getting moved-from information from svn_wc__db_scan_addition().
* subversion/libsvn_wc/wc_db.c
(get_moved_from_info): Allow the STATUS output parameter
Author: stsp
Date: Mon Aug 8 16:05:24 2011
New Revision: 1155001
URL: http://svn.apache.org/viewvc?rev=1155001view=rev
Log:
Show moved-to/moved-from information in 'svn info' output.
* subversion/include/svn_wc.h
(svn_wc_info_t): New fields MOVED_FROM_RELPATH and MOVED_TO_RELPATH
Author: stsp
Date: Tue Aug 9 09:22:24 2011
New Revision: 1155279
URL: http://svn.apache.org/viewvc?rev=1155279view=rev
Log:
Include the copyfrom revision provided to the file_added() diff callback
in git diff copied headers.
For now this is a no-op because the file_added() callback doesn't seem
Author: stsp
Date: Thu Aug 11 01:35:42 2011
New Revision: 1156434
URL: http://svn.apache.org/viewvc?rev=1156434view=rev
Log:
Use absolute paths for moved-from and moved-to in the svn_wc_info_t struct.
Suggested by: rhuijben
* subversion/include/svn_wc.h
(svn_wc_info_t): Rename
Author: stsp
Date: Thu Aug 11 17:24:52 2011
New Revision: 1156691
URL: http://svn.apache.org/viewvc?rev=1156691view=rev
Log:
* STATUS: Vote for r1156527.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Fri Aug 12 16:05:15 2011
New Revision: 1157172
URL: http://svn.apache.org/viewvc?rev=1157172view=rev
Log:
Make 'svn revert' error out if only one side of a move is reverted.
For now, 'revert' and always refuses to incompletely revert a move.
This will later be extended so
Author: stsp
Date: Fri Aug 12 20:38:38 2011
New Revision: 1157244
URL: http://svn.apache.org/viewvc?rev=1157244view=rev
Log:
Revert r1157172. I have changed my mind about how revert should handle
moves (see http://svn.haxx.se/dev/archive-2011-08/0232.shtml).
A future commit will make 'svn revert
Author: stsp
Date: Fri Aug 12 20:49:09 2011
New Revision: 1157246
URL: http://svn.apache.org/viewvc?rev=1157246view=rev
Log:
When reverting one half of a move, transform the other half into a
plain addition/copy.
* subversion/libsvn_wc/wc-queries.sql
(STMT_SELECT_NODE_INFO): Return
Author: stsp
Revision: 1157246
Modified property: svn:log
Modified: svn:log at Fri Aug 12 21:13:22 2011
--
--- svn:log (original)
+++ svn:log Fri Aug 12 21:13:22 2011
@@ -9,3 +9,5 @@ plain addition/copy
Author: stsp
Date: Mon Aug 15 17:04:15 2011
New Revision: 1157911
URL: http://svn.apache.org/viewvc?rev=1157911view=rev
Log:
* subversion/libsvn_wc/wc-metadata.sql: Fix an outdated comment.
Review by: gstein
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified
Author: stsp
Date: Mon Aug 15 17:05:50 2011
New Revision: 1157912
URL: http://svn.apache.org/viewvc?rev=1157912view=rev
Log:
Follow-up to r1157911:
* subversion/libsvn_wc/wc-metadata.sql: Fix typo in comment.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified
Author: stsp
Date: Wed Aug 17 08:17:45 2011
New Revision: 1158565
URL: http://svn.apache.org/viewvc?rev=1158565view=rev
Log:
* publish/docs/release-notes/1.7.html
(sef): Say 'neon' instead of 'libsvn_ra_neon' -- we don't need to be
that technical here.
Modified:
subversion/site/publish
Author: stsp
Date: Wed Aug 17 10:33:12 2011
New Revision: 1158617
URL: http://svn.apache.org/viewvc?rev=1158617view=rev
Log:
Remove reverted copied files and directories from disk, if they weren't
modified after being copied.
To achieve this we add more columns to rows in the revert list
Author: stsp
Date: Wed Aug 17 10:42:16 2011
New Revision: 1158619
URL: http://svn.apache.org/viewvc?rev=1158619view=rev
Log:
* CHANGES: Add an entry for issue #3101, fixed for 1.8.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc
Author: stsp
Revision: 1158617
Modified property: svn:log
Modified: svn:log at Wed Aug 17 10:44:59 2011
--
--- svn:log (original)
+++ svn:log Wed Aug 17 10:44:59 2011
@@ -71,4 +71,5 @@ Review by: julianfoad
* subversion
Author: stsp
Date: Wed Aug 17 11:27:00 2011
New Revision: 1158634
URL: http://svn.apache.org/viewvc?rev=1158634view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): Fix an error in the 'svn revert' help text.
The text used to say that 'svn revert' didn't restore removed directories
Author: stsp
Date: Wed Aug 17 11:29:01 2011
New Revision: 1158636
URL: http://svn.apache.org/viewvc?rev=1158636view=rev
Log:
* STATUS: Nominate r1158634.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Aug 17 14:10:30 2011
New Revision: 1158726
URL: http://svn.apache.org/viewvc?rev=1158726view=rev
Log:
* STATUS: The 1.7.x-r1155160 branch looks good to me, update my vote.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http
Author: stsp
Date: Wed Aug 17 19:14:09 2011
New Revision: 1158875
URL: http://svn.apache.org/viewvc?rev=1158875view=rev
Log:
Make 'svn revert' remove any kind of copied file, regardless of whether
the file was modified post-copy.
The rationale for this change can be found in a comment by Julian
1 - 100 of 4926 matches
Mail list logo
