Author: stsp
Date: Thu Nov 24 09:49:51 2011
New Revision: 1205769
URL: http://svn.apache.org/viewvc?rev=1205769view=rev
Log:
On the moves-scan-log branch, add a constructor for svn_wc_repos_move_info_t.
* subversion/include/svn_wc.h
(svn_wc_repos_move_info_t): Note that API users should not
Author: stsp
Date: Thu Nov 24 10:17:39 2011
New Revision: 1205776
URL: http://svn.apache.org/viewvc?rev=1205776view=rev
Log:
On the moves-scan-log branch, fix detection of applicable moves during update.
* subversion/libsvn_wc/update_editor.c
(find_applicable_move): Return proper move chains
Author: stsp
Date: Thu Nov 24 10:51:24 2011
New Revision: 1205784
URL: http://svn.apache.org/viewvc?rev=1205784view=rev
Log:
On the moves-scan-log branch, fix support for multiple move suggestions.
* subversion/include/svn_wc.h
(svn_wc_conflict_description2_t): Rename suggested_move to
Author: stsp
Date: Thu Nov 24 13:57:21 2011
New Revision: 1205832
URL: http://svn.apache.org/viewvc?rev=1205832view=rev
Log:
On the moves-scan-log branch, show move chains to the user.
* subversion/svn/conflict-callbacks.c
(format_move_chain_for_display): New helper.
(pick_move): Use the new
Author: philip
Date: Thu Nov 24 14:15:26 2011
New Revision: 1205839
URL: http://svn.apache.org/viewvc?rev=1205839view=rev
Log:
Fix a case of reading beyond allocated memory when asking
for locks at depth=infinity on a path that is a locked file.
Identified by valgrind running locks-test 4.
*
Author: julianfoad
Date: Thu Nov 24 14:32:24 2011
New Revision: 1205844
URL: http://svn.apache.org/viewvc?rev=1205844view=rev
Log:
Minor tweaks in merge code.
* subversion/libsvn_client/merge.c
(path_is_subtree): Don't allow the path input to be null, as we don't need
to. Rewrite the doc
Author: julianfoad
Date: Thu Nov 24 14:50:56 2011
New Revision: 1205852
URL: http://svn.apache.org/viewvc?rev=1205852view=rev
Log:
* subversion/libsvn_client/merge.c
(IS_OPERATIVE_NOTIFICATION): Document here at definition ...
(notification_receiver): ... rather than here at point of use.
Author: julianfoad
Date: Thu Nov 24 15:09:16 2011
New Revision: 1205867
URL: http://svn.apache.org/viewvc?rev=1205867view=rev
Log:
* subversion/libsvn_client/merge.c
(notification_receiver): Add an informative comment and two questions
about apparent bugs.
Modified:
Author: stsp
Date: Thu Nov 24 16:29:11 2011
New Revision: 1205914
URL: http://svn.apache.org/viewvc?rev=1205914view=rev
Log:
On the moves-scan-log branch, always create the suggested_moves array in
tree conflict descriptions, even if it is empty.
* subversion/libsvn_wc/update_editor.c
Author: stsp
Date: Thu Nov 24 16:39:32 2011
New Revision: 1205923
URL: http://svn.apache.org/viewvc?rev=1205923view=rev
Log:
On the moves-scan-log branch, rename a conflict prompt option.
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_handler): Rename 'suggest-move' to 'find-move'.
Author: stsp
Date: Thu Nov 24 16:40:53 2011
New Revision: 1205924
URL: http://svn.apache.org/viewvc?rev=1205924view=rev
Log:
On the moves-scan-log branch, remove debugging output.
* subversion/libsvn_client/update.c
(get_repos_moves): Remove debug output. The same information is now
printed
Author: julianfoad
Date: Thu Nov 24 16:59:52 2011
New Revision: 1205929
URL: http://svn.apache.org/viewvc?rev=1205929view=rev
Log:
In the merge code, remove an unused counter and other non-functional tweaks.
* subversion/libsvn_client/merge.c
(notification_receiver_baton,
Author: stsp
Date: Thu Nov 24 17:03:23 2011
New Revision: 1205931
URL: http://svn.apache.org/viewvc?rev=1205931view=rev
Log:
On the moves-scan-log branch, improve output of the conflict callback.
* subversion/svn/cl.h
(svn_cl__conflict_baton_t): Add path_prefix, to allow showing relative
Author: philip
Date: Thu Nov 24 17:08:14 2011
New Revision: 1205933
URL: http://svn.apache.org/viewvc?rev=1205933view=rev
Log:
* STATUS: Propose r1205839/r1205848.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Thu Nov 24 17:16:46 2011
New Revision: 1205936
URL: http://svn.apache.org/viewvc?rev=1205936view=rev
Log:
On the moves-scan-log branch, correctly label the local state of tree
conflicts involving a locally moved-away node.
* subversion/libsvn_wc/update_editor.c
Author: philip
Date: Thu Nov 24 17:32:26 2011
New Revision: 1205938
URL: http://svn.apache.org/viewvc?rev=1205938view=rev
Log:
A regression test for r1205848. It does exercise the code but it's not
a great test as the memory use is not enough to trigger valgrind.
*
Author: julianfoad
Date: Thu Nov 24 19:42:54 2011
New Revision: 1205964
URL: http://svn.apache.org/viewvc?rev=1205964view=rev
Log:
* subversion/libsvn_client/merge.c
(do_directory_merge): Un-break the merge tests after r1205929: set
'is_single_file_merge' to false.
Modified:
Author: stsp
Date: Thu Nov 24 19:55:12 2011
New Revision: 1205967
URL: http://svn.apache.org/viewvc?rev=1205967view=rev
Log:
Sync the moves-scan-log branch with trunk.
Modified:
subversion/branches/moves-scan-log/ (props changed)
subversion/branches/moves-scan-log/CHANGES
Author: mattiase
Date: Thu Nov 24 19:59:06 2011
New Revision: 1205968
URL: http://svn.apache.org/viewvc?rev=1205968view=rev
Log:
We only keep vc-svn.el in our tree for the benefit of Emacs 21 which
has no vc-mode for Subversion at all, and dsvn.el needs one. Clarify
that, and add code to make
Author: julianfoad
Date: Thu Nov 24 21:50:27 2011
New Revision: 1205990
URL: http://svn.apache.org/viewvc?rev=1205990view=rev
Log:
* subversion/libsvn_client/merge.c
(single_file_merge_notify): Rename a parameter. A follow-up to r1163296.
Modified:
cmpil...@apache.org wrote on Thu, Nov 24, 2011 at 05:45:25 -:
Author: cmpilato
Date: Thu Nov 24 05:45:24 2011
New Revision: 1205726
URL: http://svn.apache.org/viewvc?rev=1205726view=rev
Log:
Plug a memory leak in the fs-base deltification logic. Twice in a
decade I've seen this code
Author: danielsh
Date: Thu Nov 24 22:06:54 2011
New Revision: 1205994
URL: http://svn.apache.org/viewvc?rev=1205994view=rev
Log:
Vote for r1205726.
Modified:
subversion/branches/1.6.x/STATUS
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
22 matches
Mail list logo
