Author: luke1410
Revision: 1764826
Modified property: svn:log
Modified: svn:log at Fri Oct 14 07:52:07 2016
--
--- svn:log (original)
+++ svn:log Fri Oct 14 07:52:07 2016
@@ -1,4 +1,4 @@
-Folow-up on 1721488. Swig >= 3.0
Author: rhuijben
Date: Fri Oct 14 10:36:40 2016
New Revision: 1764857
URL: http://svn.apache.org/viewvc?rev=1764857=rev
Log:
* STATUS: Add nomination.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: kotkov
Date: Fri Oct 14 09:43:58 2016
New Revision: 1764848
URL: http://svn.apache.org/viewvc?rev=1764848=rev
Log:
Provide an option to resolve the file "local move vs incoming edit" tree
conflict by applying the incoming changes to the local move destination.
The implementation is basic
Author: rhuijben
Date: Fri Oct 14 10:38:22 2016
New Revision: 1764858
URL: http://svn.apache.org/viewvc?rev=1764858=rev
Log:
Create backport branch for r1764851.
Added:
subversion/branches/1.8.x-r1764851/ (props changed)
- copied from r1764848, subversion/branches/1.8.x/
Modified:
Author: luke1410
Date: Fri Oct 14 07:51:15 2016
New Revision: 1764826
URL: http://svn.apache.org/viewvc?rev=1764826=rev
Log:
Folow-up on 1721488. Swig >= 3.0 support was restored. Hence remove the TODO
entry (and since it's the last one delete the whole file).
* TODO: remove file
Removed:
Author: rhuijben
Date: Fri Oct 14 10:40:44 2016
New Revision: 1764861
URL: http://svn.apache.org/viewvc?rev=1764861=rev
Log:
* STATUS: Add nomination.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
Author: svn-role
Date: Sat Oct 15 04:00:06 2016
New Revision: 1765006
URL: http://svn.apache.org/viewvc?rev=1765006=rev
Log:
Merge the r1758128 group from trunk:
* r1758128, r1758129, r1758130, r1758153
Fix issue #4647.
Justification:
Resolves a regression in TSVN 1.9 with the binary
Author: ivan
Date: Fri Oct 14 12:47:52 2016
New Revision: 1764883
URL: http://svn.apache.org/viewvc?rev=1764883=rev
Log:
Move conflict resolution options' labels out of the client.
* subversion/include/svn_client.h:
(svn_client_conflict_option_get_label): New function.
*
Author: ivan
Date: Fri Oct 14 13:40:14 2016
New Revision: 1764895
URL: http://svn.apache.org/viewvc?rev=1764895=rev
Log:
Rename svn_client_conflict_option_describe() to
svn_client_conflict_option_get_description().
* subversion/include/svn_client.h
* subversion/libsvn_client/conflicts.c
Author: ivan
Date: Fri Oct 14 13:37:03 2016
New Revision: 1764892
URL: http://svn.apache.org/viewvc?rev=1764892=rev
Log:
Simplify svn_client_conflict_option_describe() API to match
svn_client_conflict_option_label().
* subversion/include/svn_client.h
* subversion/libsvn_client/conflicts.c
Author: kotkov
Date: Fri Oct 14 12:51:17 2016
New Revision: 1764884
URL: http://svn.apache.org/viewvc?rev=1764884=rev
Log:
Simplify the tree conflict resolution code a bit.
* subversion/libsvn_client/conflicts.c
(conflict_tree_get_details_local_missing,
Author: luke1410
Date: Fri Oct 14 15:45:29 2016
New Revision: 1764934
URL: http://svn.apache.org/viewvc?rev=1764934=rev
Log:
* STATUS: Change +1 to -0 vote. Nomination is missing revision r1700130.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
Author: luke1410
Date: Fri Oct 14 14:07:58 2016
New Revision: 1764902
URL: http://svn.apache.org/viewvc?rev=1764902=rev
Log:
Fix svn resolve --accept=working not working on binary conflicts by retrying
to find a resolution option for the semantically corresponding
Author: ivan
Date: Fri Oct 14 14:36:39 2016
New Revision: 1764919
URL: http://svn.apache.org/viewvc?rev=1764919=rev
Log:
Improve C90 compatibility by removing trailing commas in enum lists as well as
converting a variadic macro stub with an empty function.
* subversion/include/svn_client.h
*
Author: rhuijben
Date: Fri Oct 14 15:07:57 2016
New Revision: 1764929
URL: http://svn.apache.org/viewvc?rev=1764929=rev
Log:
* STATUS: Cast -0 vote. Patch doesn't fix issue.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
Author: rhuijben
Date: Fri Oct 14 15:04:03 2016
New Revision: 1764928
URL: http://svn.apache.org/viewvc?rev=1764928=rev
Log:
* STATUS: Cast vote. Approve issue #4647 group.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
Author: stsp
Date: Fri Oct 14 16:08:29 2016
New Revision: 1764941
URL: http://svn.apache.org/viewvc?rev=1764941=rev
Log:
Rework the code which detects nested moves in the conflict resolver.
We now detect nested moves in a second pass, by matching all deletions to the
moves detected in the first
Author: kotkov
Date: Fri Oct 14 12:53:59 2016
New Revision: 1764886
URL: http://svn.apache.org/viewvc?rev=1764886=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(create_wc_with_file_add_vs_file_add_update_conflict): Remove this unused
function.
Modified:
18 matches
Mail list logo
