Author: svn-role
Date: Wed Feb 8 04:00:10 2012
New Revision: 1241767
URL: http://svn.apache.org/viewvc?rev=1241767&view=rev
Log:
Merge r1205726 from trunk:
* r1205726
Plug a memory leak in the fs-base deltification logic which has
been observed to exhaust all the available memory on a ser
Author: hwright
Date: Wed Feb 8 03:53:52 2012
New Revision: 1241764
URL: http://svn.apache.org/viewvc?rev=1241764&view=rev
Log:
Ev2 shims: Make sure we've got the required callbacks.
* subversion/libsvn_delta/compat.c
(svn_editor__insert_shims): Add a few assertions.
Modified:
subversion/
Author: gstein
Date: Wed Feb 8 03:51:48 2012
New Revision: 1241763
URL: http://svn.apache.org/viewvc?rev=1241763&view=rev
Log:
* subversion/libsvn_delta/editor.c:
(check_unknown_child): use the correct var in the parent inspection
Modified:
subversion/trunk/subversion/libsvn_delta/editor.c
Author: gstein
Date: Wed Feb 8 02:37:34 2012
New Revision: 1241748
URL: http://svn.apache.org/viewvc?rev=1241748&view=rev
Log:
Strengthen the discussion and checks around passing all children into
an add_directory() call.
* subversion/include/svn_editor.h:
(...): clarify that children must be
Modified: subversion/branches/ev2-export/subversion/libsvn_repos/commit.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_repos/commit.c?rev=1241739&r1=1241738&r2=1241739&view=diff
==
---
Author: hwright
Date: Wed Feb 8 01:55:54 2012
New Revision: 1241733
URL: http://svn.apache.org/viewvc?rev=1241733&view=rev
Log:
Ev2 shims: Make sure that if we are providing content to alter_file(), we
are also providing a checksum.
* subversion/libsvn_delta/compat.c
(path_checksum_args): Remo
Author: gstein
Date: Wed Feb 8 01:53:47 2012
New Revision: 1241732
URL: http://svn.apache.org/viewvc?rev=1241732&view=rev
Log:
Refine some of the builtin Ev2 drive constraint checking code. In
particular, allow "alter" on the targets of copies and moves, and
ensure that move/rotate sources have n
Author: danielsh
Date: Wed Feb 8 01:25:58 2012
New Revision: 1241727
URL: http://svn.apache.org/viewvc?rev=1241727&view=rev
Log:
* STATUS: r1241530 += r1241713 r1241726
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/s
Author: danielsh
Date: Wed Feb 8 01:17:09 2012
New Revision: 1241726
URL: http://svn.apache.org/viewvc?rev=1241726&view=rev
Log:
Follow-up to r1241713: restore compatibility with old Pythons.
* subversion/bindings/swig/python/tests/client.py
(test_platform_providers): Use filter() instead of a
Author: danielsh
Date: Wed Feb 8 00:54:05 2012
New Revision: 1241720
URL: http://svn.apache.org/viewvc?rev=1241720&view=rev
Log:
Nominate r1241553.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.
Author: stefan2
Date: Wed Feb 8 00:44:26 2012
New Revision: 1241718
URL: http://svn.apache.org/viewvc?rev=1241718&view=rev
Log:
Major improvement in delta window handling: Cache intermediate
combined delta windows such that changes "close by" won't need
to discover and read the whole chain again.
Author: danielsh
Date: Wed Feb 8 00:30:48 2012
New Revision: 1241713
URL: http://svn.apache.org/viewvc?rev=1241713&view=rev
Log:
Improve the testcase for the python binding for
svn_auth_get_platform_specific_client_providers.
This test was introduced in r1241530, but it only checked if a list wa
Author: stsp
Date: Wed Feb 8 00:05:47 2012
New Revision: 1241709
URL: http://svn.apache.org/viewvc?rev=1241709&view=rev
Log:
Fix python bindings regression tests failures with Python < 2.7.
* subversion/bindings/swig/python/tests/client.py
(testGnomeKeyring): Don't use an annotation (@unittest
Author: stefan2
Date: Tue Feb 7 23:09:40 2012
New Revision: 1241694
URL: http://svn.apache.org/viewvc?rev=1241694&view=rev
Log:
Fix an asymmetry between the default serializer and deserializer -
they should both use the same string type. Let's use svn_stringbuf_t.
* subversion/libsvn_subr/cache-
Author: stsp
Revision: 1241618
Modified property: svn:log
Modified: svn:log at Tue Feb 7 23:07:54 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 23:07:54 2012
@@ -1,3 +1,5 @@
+[ Note from the future: reverted in r1
Author: stsp
Date: Tue Feb 7 23:05:29 2012
New Revision: 1241691
URL: http://svn.apache.org/viewvc?rev=1241691&view=rev
Log:
Only run the gnome keyring unlock function test when the needed function
is available. This should prevent test failures on platforms without
gnome-keyring.
* python/tests
Author: stsp
Date: Tue Feb 7 23:04:39 2012
New Revision: 1241689
URL: http://svn.apache.org/viewvc?rev=1241689&view=rev
Log:
Revert r1241618. Matthijs Kooijman has provided a better fix.
Modified:
subversion/trunk/subversion/bindings/swig/python/tests/client.py
Modified: subversion/trunk/su
Author: gstein
Revision: 1241687
Modified property: svn:log
Modified: svn:log at Tue Feb 7 23:04:15 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 23:04:15 2012
@@ -1,6 +1,8 @@
Clean up some of the Ev2 driver orde
Author: gstein
Date: Tue Feb 7 23:03:47 2012
New Revision: 1241687
URL: http://svn.apache.org/viewvc?rev=1241687&view=rev
Log:
Clean up some of the Ev2 driver ordering checks. Use macros to make
the code more readable.
* subversion/libsvn_delta/editor.c:
(SHOULD_NOT_BE_FINISHED, MARK_COMPLETED
Author: hwright
Date: Tue Feb 7 22:55:32 2012
New Revision: 1241683
URL: http://svn.apache.org/viewvc?rev=1241683&view=rev
Log:
Ev2 shims: Make sure we pass a valid props hash to add_file() and
add_directory().
* subversion/libsvn_delta/compat.c
(process_actions): Provide an empty, rather than
Author: stsp
Date: Tue Feb 7 22:53:48 2012
New Revision: 1241682
URL: http://svn.apache.org/viewvc?rev=1241682&view=rev
Log:
The conditional around the declaration of
svn_auth_set_gnome_keyring_unlock_prompt_func (introduced in r1241585)
was not functioning properly, it prevented the bindings fro
Author: gstein
Date: Tue Feb 7 22:39:43 2012
New Revision: 1241676
URL: http://svn.apache.org/viewvc?rev=1241676&view=rev
Log:
Add documentation for the alter_* callbacks and the updated (removal)
of various constraints in the edit drive process.
* subversion/include/svn_editor.h:
(...): adjus
Author: hwright
Revision: 1241651
Modified property: svn:log
Modified: svn:log at Tue Feb 7 21:59:54 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 21:59:54 2012
@@ -8,3 +8,6 @@ Current number of Ev2 test failures:
Author: hwright
Date: Tue Feb 7 21:58:07 2012
New Revision: 1241653
URL: http://svn.apache.org/viewvc?rev=1241653&view=rev
Log:
Revert an inadvertant part of r1241651.
Modified:
subversion/trunk/subversion/include/svn_error.h
Modified: subversion/trunk/subversion/include/svn_error.h
URL:
h
Author: stsp
Date: Tue Feb 7 21:57:15 2012
New Revision: 1241652
URL: http://svn.apache.org/viewvc?rev=1241652&view=rev
Log:
On the moves-scan-log branch:
* subversion/include/svn_wc.h
(svn_wc_conflict_choice_t): The conflict callback may well choose an
incoming move on behalf of the user,
Author: hwright
Date: Tue Feb 7 21:57:02 2012
New Revision: 1241651
URL: http://svn.apache.org/viewvc?rev=1241651&view=rev
Log:
Ev2 shims: Don't violate the Ev2 ordering constraints by calling abort()
after complete() returns an error.
Current number of Ev2 test failures: 8
* subversion/libsvn_
Author: hwright
Revision: 1241608
Modified property: svn:log
Modified: svn:log at Tue Feb 7 21:23:18 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 21:23:18 2012
@@ -1,3 +1,5 @@
+[Note from the future: reverted in
Author: hwright
Date: Tue Feb 7 21:22:52 2012
New Revision: 1241635
URL: http://svn.apache.org/viewvc?rev=1241635&view=rev
Log:
Revert r1241608, since it now tests for an impossible condition.
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/
Author: hwright
Date: Tue Feb 7 21:20:54 2012
New Revision: 1241631
URL: http://svn.apache.org/viewvc?rev=1241631&view=rev
Log:
Ev2: complete() and abort() should be mutually exclusive.
* subversion/libsvn_delta/editor.c
(svn_editor_complete): Unconditionally mark the edit as "done".
Modified
Author: stsp
Date: Tue Feb 7 21:13:45 2012
New Revision: 1241628
URL: http://svn.apache.org/viewvc?rev=1241628&view=rev
Log:
Make the perl bindings test skip the gnome-keyring test if gnome-keyring
has not been compiled in.
* subversion/bindings/swig/perl/native/t/3client.t
(gnome-kerying test
Author: hwright
Date: Tue Feb 7 21:06:12 2012
New Revision: 1241626
URL: http://svn.apache.org/viewvc?rev=1241626&view=rev
Log:
Update a test to use unordered output.
Current number of Ev2 test failures: 8
* subversion/tests/cmdline/switch_tests.py
(mergeinfo_switch_elision): Use unordered ex
Author: danielsh
Date: Tue Feb 7 21:01:10 2012
New Revision: 1241623
URL: http://svn.apache.org/viewvc?rev=1241623&view=rev
Log:
Documentations clarification. (Please review for correctness.)
* subversion/include/svn_delta.h
(svn_delta_editor_t): Explicitly define that abort_edit() must be
Author: stsp
Date: Tue Feb 7 20:54:26 2012
New Revision: 1241618
URL: http://svn.apache.org/viewvc?rev=1241618&view=rev
Log:
Fix a test failure in the python bindings.
* subversion/bindings/swig/python/tests/client.py
(SubversionClientTestCase.testGnomeKeyring): If calling the
svn_auth_set_
Author: danielsh
Revision: 1241600
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:45:47 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:45:47 2012
@@ -7,3 +7,5 @@ configuration option.
* tools/exam
Author: hwright
Date: Tue Feb 7 20:45:03 2012
New Revision: 1241608
URL: http://svn.apache.org/viewvc?rev=1241608&view=rev
Log:
Ev2 shims: Don't attempt to drive an editor multiple times.
Current number of Ev2 test failures: 9
* subversion/libsvn_delta/compat.c
(editor_baton): New driven memb
Author: danielsh
Date: Tue Feb 7 20:32:11 2012
New Revision: 1241600
URL: http://svn.apache.org/viewvc?rev=1241600&view=rev
Log:
Let the get-location-segments.py example pass a proper config to
svn_auth_get_platform_specific_client_providers.
This call was introduced in r1241530, but it did not
Author: hwright
Date: Tue Feb 7 20:31:21 2012
New Revision: 1241599
URL: http://svn.apache.org/viewvc?rev=1241599&view=rev
Log:
Editors are not required to provide the base checksum, so allow the dumpfile
comparor to ignore them.
This change is being made specifically to placate the Ev2 editor s
Author: hwright
Revision: 1175336
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:14:45 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:14:45 2012
@@ -2,4 +2,5 @@
(svnlook-filesize): Mention that
Author: hwright
Revision: 1165752
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:14:18 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:14:18 2012
@@ -4,7 +4,7 @@ Not writing successors for empty rev
Author: hwright
Revision: 866391
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:13:52 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:13:52 2012
@@ -5,4 +5,4 @@ for extsn in c h cpp java py pl rb; d
Author: hwright
Revision: 1128255
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:13:05 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:13:05 2012
@@ -1,4 +1,5 @@
* subversion/include/svn_io.h
(s
Author: hwright
Revision: 1186928
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:12:39 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:12:39 2012
@@ -2,7 +2,7 @@ Don't rely on the current implementa
Author: hwright
Revision: 1167269
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:12:12 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:12:12 2012
@@ -8,4 +8,5 @@ dir externals was upgraded, not the
Author: hwright
Revision: 1199950
Modified property: svn:log
Modified: svn:log at Tue Feb 7 20:11:34 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 20:11:34 2012
@@ -10,5 +10,5 @@ any further.
(patch_delete_and_s
Author: stsp
Date: Tue Feb 7 19:55:31 2012
New Revision: 1241585
URL: http://svn.apache.org/viewvc?rev=1241585&view=rev
Log:
Attempt to fix the bindings build on Windows.
* subversion/bindings/swig/core.i
(svn_auth_set_gnome_keyring_unlock_prompt_func): Wrap the function
declaration in #ifd
Author: stsp
Date: Tue Feb 7 19:10:41 2012
New Revision: 1241554
URL: http://svn.apache.org/viewvc?rev=1241554&view=rev
Log:
Allow setting the SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
authentication parameter from the perl, python and ruby bindings.
This parameter cannot be set using the
Author: stsp
Date: Tue Feb 7 19:04:02 2012
New Revision: 1241553
URL: http://svn.apache.org/viewvc?rev=1241553&view=rev
Log:
Fix the ruby bindings for svn_auth_get_platform_specific_client_providers.
The bindings were present, but due to a missing argout typemap for
apr_array_header_t **provider
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=29&rev2=30
End of longest continuous prefix of sourc
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=28&rev2=29
More significantly, neither does the merg
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-2.txt
Attachment size: 341
Attachment link:
http://wiki.apa
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-2.png
Attachment size: 29808
Attachment link:
http://wiki.a
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.txt
Attachment size: 320
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.png
Attachment size: 19127
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-1.txt
Attachment size: 383
Attachment link:
http://wiki.apa
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-1.png
Attachment size: 21531
Attachment link:
http://wiki.a
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-3.txt
Attachment size: 321
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-3.png
Attachment size: 21113
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-2.txt
Attachment size: 321
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-2.png
Attachment size: 23091
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.txt
Attachment size: 344
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.png
Attachment size: 19916
Attachment link:
http://wiki.ap
Author: stsp
Date: Tue Feb 7 18:21:04 2012
New Revision: 1241540
URL: http://svn.apache.org/viewvc?rev=1241540&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Add empty placeholders for the following tree conflict
resolution cases (none imp
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-1.txt
Attachment size: 433
Attachment link:
http://wiki.apa
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-back-sync-1.png
Attachment size: 24624
Attachment link:
http://wiki.a
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=27&rev2=28
Those are the basic cases that Subversion
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.txt
Attachment size: 350
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.png
Attachment size: 20410
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-3.txt
Attachment size: 377
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-3.txt
Attachment size: 377
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-3.png
Attachment size: 23204
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-2.txt
Attachment size: 377
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-2.png
Attachment size: 28232
Attachment link:
http://wiki.ap
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.txt
Attachment size: 300
Attachment link:
http://wiki.apac
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-cherry-fwd-sync-1.png
Attachment size: 17397
Attachment link:
http://wiki.ap
Author: danielsh
Date: Tue Feb 7 17:51:26 2012
New Revision: 1241534
URL: http://svn.apache.org/viewvc?rev=1241534&view=rev
Log:
Nominate r1241530.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.
Author: hwright
Revision: 1241097
Modified property: svn:log
Modified: svn:log at Tue Feb 7 17:50:15 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 17:50:15 2012
@@ -10,6 +10,9 @@ and it hasn't changed.
Current nu
Author: hwright
Date: Tue Feb 7 17:49:27 2012
New Revision: 1241531
URL: http://svn.apache.org/viewvc?rev=1241531&view=rev
Log:
Revert r1241097, persuant to the discussion in this thread:
http://svn.haxx.se/dev/archive-2012-02/0116.shtml
Modified:
subversion/trunk/subversion/libsvn_client/re
Author: danielsh
Date: Tue Feb 7 17:44:43 2012
New Revision: 1241530
URL: http://svn.apache.org/viewvc?rev=1241530&view=rev
Log:
Fix the python bindings for svn_auth_get_platform_specific_client_providers.
The bindings were present, but due to a missing argout typemap for
apr_array_header_t **pr
Author: julianfoad
Date: Tue Feb 7 17:40:29 2012
New Revision: 1241529
URL: http://svn.apache.org/viewvc?rev=1241529&view=rev
Log:
* ../tools/dev/mergegraph/mergegraph.py
(add_annotation): Change the annotation style to a pale blue background.
Modified:
subversion/trunk/tools/dev/mergegrap
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=26&rev2=27
The conclusion is: to merge correctly, th
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=25&rev2=26
What we need is a single algorithm that f
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=24&rev2=25
- What's the theoretical difference between 's
Author: stsp
Date: Tue Feb 7 16:45:20 2012
New Revision: 1241516
URL: http://svn.apache.org/viewvc?rev=1241516&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Use more obvious conditions when testing for the
'local moved away, incoming dele
Author: stsp
Date: Tue Feb 7 16:44:27 2012
New Revision: 1241515
URL: http://svn.apache.org/viewvc?rev=1241515&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Handle the 'local delete vs. incoming delete' case
which is of course trivial to
Author: julianfoad
Date: Tue Feb 7 16:35:50 2012
New Revision: 1241512
URL: http://svn.apache.org/viewvc?rev=1241512&view=rev
Log:
* tools/dev/mergegraph/mergegraph.py
(read_config): To simplify graph config files, supply a default output
filename based on the config file name; and make the
Author: stsp
Date: Tue Feb 7 16:15:36 2012
New Revision: 1241507
URL: http://svn.apache.org/viewvc?rev=1241507&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Move the block of code that auto-merges an incoming delete
on top of a local move
Dear Wiki user,
You have subscribed to a wiki page "KeepingReintegratedBranchAlive" for change
notification. An attachment has been added to that page by JulianFoad.
Following detailed information is available:
Attachment name: merge-transitive-partial-1.txt
Attachment size: 302
Attachment link
Dear Wiki user,
You have subscribed to a wiki page "KeepingReintegratedBranchAlive" for change
notification. An attachment has been added to that page by JulianFoad.
Following detailed information is available:
Attachment name: merge-transitive-partial-1.png
Attachment size: 23522
Attachment li
Author: stsp
Revision: 1241490
Modified property: svn:log
Modified: svn:log at Tue Feb 7 15:46:42 2012
--
--- svn:log (original)
+++ svn:log Tue Feb 7 15:46:42 2012
@@ -2,7 +2,7 @@ On the moves-scan-log branch:
* subv
Author: stsp
Date: Tue Feb 7 15:44:40 2012
New Revision: 1241493
URL: http://svn.apache.org/viewvc?rev=1241493&view=rev
Log:
On the moves-scan-log branch:
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_handler): Fix reversed logic in help text of the
move conflict prompt.
Modified
Author: stsp
Date: Tue Feb 7 15:42:35 2012
New Revision: 1241490
URL: http://svn.apache.org/viewvc?rev=1241490&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Invoke the conflict callback again after determining
details of an "incoming move
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
change notification.
The "InheritedProperties" page has been changed by pburba:
http://wiki.apache.org/subversion/InheritedProperties?action=diff&rev1=27&rev2=28
Comment:
Fix a typo - Too much mergeinfo
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-sync-1-svn.txt
Attachment size: 316
Attachment link:
http://wiki.apache.org/
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-sync-1-svn.png
Attachment size: 21510
Attachment link:
http://wiki.apache.or
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-sync-1-req.txt
Attachment size: 273
Attachment link:
http://wiki.apache.org/
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-sync-1-req.png
Attachment size: 15386
Attachment link:
http://wiki.apache.or
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-reint-2.txt
Attachment size: 358
Attachment link:
http://wiki.apache.org/sub
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-reint-2.png
Attachment size: 25200
Attachment link:
http://wiki.apache.org/s
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-reint-1.txt
Attachment size: 358
Attachment link:
http://wiki.apache.org/sub
Dear Wiki user,
You have subscribed to a wiki page "SvnMergeTheory" for change notification. An
attachment has been added to that page by JulianFoad. Following detailed
information is available:
Attachment name: merge-reint-1.png
Attachment size: 25571
Attachment link:
http://wiki.apache.org/s
1 - 100 of 155 matches
Mail list logo
