Author: kotkov
Date: Tue Oct 11 15:38:36 2016
New Revision: 1764271
URL: http://svn.apache.org/viewvc?rev=1764271=rev
Log:
* subversion/libsvn_client/conflicts.c
(check_move_ancestry): Explicitly initialize the output argument in
all cases, to make the code a bit clearer.
Modified:
Author: stsp
Date: Tue Oct 11 15:43:14 2016
New Revision: 1764272
URL: http://svn.apache.org/viewvc?rev=1764272=rev
Log:
On the resolve-incoming-add branch:
* subversion/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_merge2): Sync docstring with reality.
Modified:
Author: stsp
Date: Tue Oct 11 15:51:26 2016
New Revision: 1764275
URL: http://svn.apache.org/viewvc?rev=1764275=rev
Log:
On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.
* subversion/tests/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_merge3): Fix this test to
Author: stsp
Date: Tue Oct 11 15:58:13 2016
New Revision: 1764276
URL: http://svn.apache.org/viewvc?rev=1764276=rev
Log:
On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.
* subversion/libsvn_client/conflicts.c
(diff_dir_changed, diff_dir_deleted, diff_file_changed,
Author: stsp
Date: Tue Oct 11 16:01:59 2016
New Revision: 1764279
URL: http://svn.apache.org/viewvc?rev=1764279=rev
Log:
On the 'resolve-incoming-add' branch: Make a FAILing test PASS again.
* subversion/tests/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_merge2): Account for
Author: stsp
Date: Tue Oct 11 16:08:25 2016
New Revision: 1764284
URL: http://svn.apache.org/viewvc?rev=1764284=rev
Log:
On the 'resolve-incoming-add' branch: Remove unnecessary code.
* subversion/libsvn_client/conflicts.c
(diff_dir_changed, diff_dir_deleted, diff_file_changed,
Author: luke1410
Date: Tue Oct 11 16:08:21 2016
New Revision: 1764283
URL: http://svn.apache.org/viewvc?rev=1764283=rev
Log:
Correct typos in comments.
* subversion/libsvn_wc/entries.c (write_entry): correct typo
* subversion/libsvn_client/conflicts.c (): correct typo
Obvious fix.
Modified:
Author: stsp
Date: Tue Oct 11 14:27:25 2016
New Revision: 1764254
URL: http://svn.apache.org/viewvc?rev=1764254=rev
Log:
On the resolve-incoming-add branch:
* subversion/libsvn_client/conflicts.c
(diff_dir_added): Remove SVN_DBG calls.
Modified:
Author: kotkov
Date: Tue Oct 11 15:59:10 2016
New Revision: 1764277
URL: http://svn.apache.org/viewvc?rev=1764277=rev
Log:
Following up on r1764273, fix indentation in the check_move_ancestry()
function.
* subversion/libsvn_client/conflicts.c
(check_move_ancestry): As above.
Modified:
Author: stsp
Date: Tue Oct 11 15:28:38 2016
New Revision: 1764269
URL: http://svn.apache.org/viewvc?rev=1764269=rev
Log:
On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.
* subversion/tests/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_merge): Fix this test to
Author: kotkov
Date: Tue Oct 11 15:47:07 2016
New Revision: 1764273
URL: http://svn.apache.org/viewvc?rev=1764273=rev
Log:
Fix tracing of the chained incoming moves in the tree conflict resolver.
We only need to take the last-changed revision of the deleted node into
account while mapping a
Author: stsp
Date: Tue Oct 11 15:10:46 2016
New Revision: 1764266
URL: http://svn.apache.org/viewvc?rev=1764266=rev
Log:
On the resolve-incoming-add branch:
* subversion/libsvn_client/conflicts.c
(diff_file_added): Add a file to the working copy. Remove SVN_DBG calls.
Modified:
Author: kotkov
Date: Tue Oct 11 15:35:07 2016
New Revision: 1764270
URL: http://svn.apache.org/viewvc?rev=1764270=rev
Log:
Lay some groundwork for fixing the chained incoming moves conflict
resolution by fixing a minor bug in the check_move_ancestry() function.
*
Author: rhuijben
Date: Tue Oct 11 13:30:48 2016
New Revision: 1764235
URL: http://svn.apache.org/viewvc?rev=1764235=rev
Log:
On the ra-git branch: Fix compilation of libsvn_fs_git by fixing one
minor libsvn_fs change and a libgit2 error handling change.
* subversion/libsvn_fs_git/git-revroot.c
Author: stsp
Date: Tue Oct 11 13:40:10 2016
New Revision: 1764239
URL: http://svn.apache.org/viewvc?rev=1764239=rev
Log:
On the 'resolve-incoming-add' branch:
When merging added directory trees, merge the properties at the root folder.
* subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Oct 11 13:40:59 2016
New Revision: 1764240
URL: http://svn.apache.org/viewvc?rev=1764240=rev
Log:
On the resolve-incoming-add branch: Merge with trunk.
Added:
subversion/branches/resolve-incoming-add/notes/meetings/berlin-16-minutes
- copied unchanged from
Author: kotkov
Date: Tue Oct 11 13:05:56 2016
New Revision: 1764234
URL: http://svn.apache.org/viewvc?rev=1764234=rev
Log:
Add a test for "incoming move vs local edit" tree conflict resolution upon
merge, where the file has been moved twice, and also it was deleted and
recreated between these
Author: rhuijben
Date: Tue Oct 11 13:55:30 2016
New Revision: 1764248
URL: http://svn.apache.org/viewvc?rev=1764248=rev
Log:
On the ra-git branch: Fix compilation of libsvn_ra_git.
* build/generator/gen_win_dependencies.py
Add libssh2 as optional dependency.
* build.conf
(libssh2): Declare
Author: ivan
Date: Tue Oct 11 10:37:10 2016
New Revision: 1764221
URL: http://svn.apache.org/viewvc?rev=1764221=rev
Log:
Fix minor bug in property conflict interactive resolver.
* subversion/svn/conflict-callbacks.c
(merge_prop_conflict): Check THEIR_PROPVAL for NULL instead of checking
Author: luke1410
Date: Tue Oct 11 20:16:28 2016
New Revision: 1764340
URL: http://svn.apache.org/viewvc?rev=1764340=rev
Log:
Corrected spelling mistakes in comments.
* subversion/include/private/svn_utf_private.h
(svn_utf__glob): as above
* subversion/include/svn_fs.h
Author: stsp
Date: Tue Oct 11 16:12:55 2016
New Revision: 1764285
URL: http://svn.apache.org/viewvc?rev=1764285=rev
Log:
Merge the resolve-incoming-add branch to trunk.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Oct 11 16:13:23 2016
New Revision: 1764286
URL: http://svn.apache.org/viewvc?rev=1764286=rev
Log:
Remove resolve-incoming-add branch. Merged to trunk in r1764285.
Removed:
subversion/branches/resolve-incoming-add/
Author: stefan2
Date: Tue Oct 11 20:08:44 2016
New Revision: 1764337
URL: http://svn.apache.org/viewvc?rev=1764337=rev
Log:
On the authzperf branch:
Make handling of "**" (any-var) match user's expectations. See test cases.
This fixes the calculation of recursive access rights. The
Author: luke1410
Revision: 1764340
Modified property: svn:log
Modified: svn:log at Tue Oct 11 20:17:11 2016
--
--- svn:log (original)
+++ svn:log Tue Oct 11 20:17:11 2016
@@ -20,3 +20,5 @@ Corrected spelling mistakes in
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "ContributorsGroup" page has been changed by JohanCorveleyn:
https://wiki.apache.org/subversion/ContributorsGroup?action=diff=17=18
#acl
Modified: subversion/branches/ra-git/subversion/mod_dav_svn/reports/log.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/mod_dav_svn/reports/log.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_client/merge.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_diff/diff3.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_diff/diff3.c?rev=1764214=1764213=1764214=diff
==
---
Modified:
subversion/branches/ra-git/subversion/tests/cmdline/mod_dav_svn_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/mod_dav_svn_tests.py?rev=1764214=1764213=1764214=diff
Modified: subversion/branches/ra-git/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/svn/conflict-callbacks.c?rev=1764214=1764213=1764214=diff
==
---
Modified:
subversion/branches/ra-git/subversion/tests/cmdline/svntest/mergetrees.py
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/svntest/mergetrees.py?rev=1764214=1764213=1764214=diff
Author: rhuijben
Date: Tue Oct 11 09:11:50 2016
New Revision: 1764214
URL: http://svn.apache.org/viewvc?rev=1764214=rev
Log:
Bring up to date with trunk, resolving a few minor text conflicts in build.conf
Added:
subversion/branches/ra-git/notes/meetings/berlin-16-minutes
- copied
Modified: subversion/branches/ra-git/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_serf/commit.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/svnadmin_tests.py?rev=1764214=1764213=1764214=diff
==
Modified: subversion/branches/ra-git/subversion/svnserve/cyrus_auth.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/svnserve/cyrus_auth.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_fs_fs/pack.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_fs/pack.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_wc/wc_db_update_move.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_wc/wc_db_update_move.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/tools/dev/svnmover/scanlog.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/tools/dev/svnmover/scanlog.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/contrib/client-side/svn_apply_autoprops.py
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/contrib/client-side/svn_apply_autoprops.py?rev=1764214=1764213=1764214=diff
==
Modified: subversion/branches/ra-git/subversion/tests/libsvn_subr/stream-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/libsvn_subr/stream-test.c?rev=1764214=1764213=1764214=diff
==
Modified: subversion/branches/ra-git/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/include/private/svn_wc_private.h?rev=1764214=1764213=1764214=diff
==
Modified: subversion/branches/ra-git/subversion/libsvn_fs_x/revprops.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_x/revprops.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_repos/replay.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_repos/replay.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/svn/info-cmd.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_subr/utf_validate.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_subr/utf_validate.c?rev=1764214=1764213=1764214=diff
==
---
Modified: subversion/branches/ra-git/subversion/libsvn_fs_x/batch_fsync.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_x/batch_fsync.c?rev=1764214=1764213=1764214=diff
==
---
46 matches
Mail list logo
