svn commit: r1202630 - in /subversion/trunk/subversion/libsvn_wc: entries.c wc_db.c

2011-11-16 Thread philip
Author: philip Date: Wed Nov 16 10:52:56 2011 New Revision: 1202630 URL: http://svn.apache.org/viewvc?rev=1202630view=rev Log: Make BASE files that have no checksum an error; this prevents future operations asserting on such nodes and should avoid the corrupt working copies seen in issue 4062. *

svn commit: r1202632 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread philip
Author: philip Date: Wed Nov 16 10:56:49 2011 New Revision: 1202632 URL: http://svn.apache.org/viewvc?rev=1202632view=rev Log: * STATUS: Propose r1202630 Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1202665 - in /subversion/trunk/subversion/tests/cmdline: merge_tests.py merge_tree_conflict_tests.py

2011-11-16 Thread julianfoad
Author: julianfoad Date: Wed Nov 16 12:34:14 2011 New Revision: 1202665 URL: http://svn.apache.org/viewvc?rev=1202665view=rev Log: In some merge tests, hard-code less of the command-line output formatting and instead isolate that knowledge in one place. * subversion/tests/cmdline/merge_tests.py

svn commit: r1202682 - in /subversion/branches/showing-merge-info: ./ subversion/libsvn_wc/ subversion/svn/ subversion/tests/cmdline/

2011-11-16 Thread julianfoad
Author: julianfoad Date: Wed Nov 16 12:51:31 2011 New Revision: 1202682 URL: http://svn.apache.org/viewvc?rev=1202682view=rev Log: On the 'showing-merge-info' branch: Catch up to trunk@1202674. Modified: subversion/branches/showing-merge-info/ (props changed)

svn commit: r1202692 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 13:08:51 2011 New Revision: 1202692 URL: http://svn.apache.org/viewvc?rev=1202692view=rev Log: * STATUS: I like r1202630. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

[Subversion Wiki] Update of DesignNotes by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The DesignNotes page has been changed by JulianFoad: http://wiki.apache.org/subversion/DesignNotes?action=diffrev1=13rev2=14 BranchesAndBranchRoots — about teaching Subversion

[Subversion Wiki] Update of CallGraphOfMergeCode by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The CallGraphOfMergeCode page has been changed by JulianFoad: http://wiki.apache.org/subversion/CallGraphOfMergeCode New page: {{{ merge_reintegrate[_locked] | |

[Subversion Wiki] Trivial Update of CallGraphOfMergeCode by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The CallGraphOfMergeCode page has been changed by JulianFoad: http://wiki.apache.org/subversion/CallGraphOfMergeCode?action=diffrev1=1rev2=2 | +-- )

[Subversion Wiki] Trivial Update of CallGraphOfMergeCode by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The CallGraphOfMergeCode page has been changed by JulianFoad: http://wiki.apache.org/subversion/CallGraphOfMergeCode?action=diffrev1=2rev2=3 | | merge_peg[_locked] +

[Subversion Wiki] Update of DesignNotes by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The DesignNotes page has been changed by JulianFoad: http://wiki.apache.org/subversion/DesignNotes?action=diffrev1=14rev2=15 CallGraphOfMergeCode + UserInterfaceChanges +

svn commit: r1202721 - in /subversion/trunk/subversion/svn: cl.h main.c notify.c

2011-11-16 Thread cmpilato
Author: cmpilato Date: Wed Nov 16 14:35:58 2011 New Revision: 1202721 URL: http://svn.apache.org/viewvc?rev=1202721view=rev Log: Eliminate a boolean that only ever sees one state. * subversion/svn/cl.h (svn_cl__get_notifier): Remove 'suppress_final_line' parameter (which was named

svn commit: r1202723 - /subversion/trunk/subversion/svn/notify.c

2011-11-16 Thread cmpilato
Author: cmpilato Date: Wed Nov 16 14:37:17 2011 New Revision: 1202723 URL: http://svn.apache.org/viewvc?rev=1202723view=rev Log: * subversion/svn/notify.c (notify): Indentation fixes only (follow-up to r1202721). Modified: subversion/trunk/subversion/svn/notify.c Modified:

svn commit: r1202724 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread hwright
Author: hwright Date: Wed Nov 16 14:40:21 2011 New Revision: 1202724 URL: http://svn.apache.org/viewvc?rev=1202724view=rev Log: * STATUS: Remove already-merged group. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

[Subversion Wiki] Update of UserInterfaceChanges by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The UserInterfaceChanges page has been changed by JulianFoad: http://wiki.apache.org/subversion/UserInterfaceChanges New page: What user-visible changes am I thinking of? *

[Subversion Wiki] Update of UserInterfaceChanges by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The UserInterfaceChanges page has been changed by JulianFoad: http://wiki.apache.org/subversion/UserInterfaceChanges?action=diffrev1=1rev2=2 * RepetitiveResolvingOfTheSameRename

[Subversion Wiki] Update of UserInterfaceChanges by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The UserInterfaceChanges page has been changed by JulianFoad: http://wiki.apache.org/subversion/UserInterfaceChanges?action=diffrev1=2rev2=3 What user-visible changes am I thinking

[Subversion Wiki] Trivial Update of UserInterfaceChanges by JulianFoad

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The UserInterfaceChanges page has been changed by JulianFoad: http://wiki.apache.org/subversion/UserInterfaceChanges?action=diffrev1=3rev2=4 What user-visible changes am I thinking

svn commit: r1202750 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2011-11-16 Thread julianfoad
Author: julianfoad Date: Wed Nov 16 15:50:48 2011 New Revision: 1202750 URL: http://svn.apache.org/viewvc?rev=1202750view=rev Log: Fix Windows test breakage caused by r1202665. * subversion/tests/cmdline/merge_tests.py (expected_merge_output): Correct the doc string. (svn_merge): Don't

svn commit: r1202783 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

2011-11-16 Thread philip
Author: philip Date: Wed Nov 16 17:06:50 2011 New Revision: 1202783 URL: http://svn.apache.org/viewvc?rev=1202783view=rev Log: * subversion/libsvn_fs_fs/fs_fs.c (rep_write_contents_close): Log root cause, rather than a generic error, when failing to open rep-cache.db. Modified:

svn commit: r1202788 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread philip
Author: philip Date: Wed Nov 16 17:18:56 2011 New Revision: 1202788 URL: http://svn.apache.org/viewvc?rev=1202788view=rev Log: * STATUS: Propose r1202783 Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1202794 - in /subversion/trunk/subversion/tests/cmdline: merge_tests.py merge_tree_conflict_tests.py svntest/main.py

2011-11-16 Thread julianfoad
Author: julianfoad Date: Wed Nov 16 17:25:02 2011 New Revision: 1202794 URL: http://svn.apache.org/viewvc?rev=1202794view=rev Log: In some merge tests, generate more of the expected output centrally, through expected_merge_output(). * subversion/tests/cmdline/merge_tests.py

Re: svn commit: r1202783 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

2011-11-16 Thread Daniel Shahaf
On Wednesday, November 16, 2011 5:06 PM, phi...@apache.org wrote: Author: philip Date: Wed Nov 16 17:06:50 2011 New Revision: 1202783 URL: http://svn.apache.org/viewvc?rev=1202783view=rev Log: * subversion/libsvn_fs_fs/fs_fs.c (rep_write_contents_close): Log root cause, rather than a

svn commit: r1202799 - in /subversion/trunk/subversion/svn: cl.h main.c status-cmd.c status.c

2011-11-16 Thread cmpilato
Author: cmpilato Date: Wed Nov 16 17:29:42 2011 New Revision: 1202799 URL: http://svn.apache.org/viewvc?rev=1202799view=rev Log: For issue #1935 (svn status too verbose with svn:externals definitions), make 'svn status' suppress the printing of X and Performing status on external item... lines

svn commit: r1202804 - in /subversion/branches/showing-merge-info: ./ subversion/libsvn_fs_fs/ subversion/svn/ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/

2011-11-16 Thread julianfoad
Author: julianfoad Date: Wed Nov 16 17:46:03 2011 New Revision: 1202804 URL: http://svn.apache.org/viewvc?rev=1202804view=rev Log: On the 'showing-merge-info' branch: Catch up to trunk@1202802. Modified: subversion/branches/showing-merge-info/ (props changed)

svn commit: r1202805 - /subversion/trunk/CHANGES

2011-11-16 Thread cmpilato
Author: cmpilato Date: Wed Nov 16 17:47:06 2011 New Revision: 1202805 URL: http://svn.apache.org/viewvc?rev=1202805view=rev Log: * CHANGES Followup to r1202799 by noting the change. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL:

svn commit: r1202807 - /subversion/trunk/subversion/libsvn_client/merge.c

2011-11-16 Thread pburba
Author: pburba Date: Wed Nov 16 17:50:22 2011 New Revision: 1202807 URL: http://svn.apache.org/viewvc?rev=1202807view=rev Log: Fix a potential segfault during a merge. Found by: steveking See http://svn.haxx.se/dev/archive-2011-11/0261.shtml * subversion/libsvn_client/merge.c

svn commit: r1202809 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread pburba
Author: pburba Date: Wed Nov 16 17:56:18 2011 New Revision: 1202809 URL: http://svn.apache.org/viewvc?rev=1202809view=rev Log: * STATUS: Nominate r1202807. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1202830 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread danielsh
Author: danielsh Date: Wed Nov 16 18:43:46 2011 New Revision: 1202830 URL: http://svn.apache.org/viewvc?rev=1202830view=rev Log: * STATUS (r1202783): Add a pointer to the dev@ thread about this patch. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1202836 - /subversion/branches/1.7.x/STATUS

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 18:58:09 2011 New Revision: 1202836 URL: http://svn.apache.org/viewvc?rev=1202836view=rev Log: * STATUS: Approve r1202807. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL:

svn commit: r1202852 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/merge.c

2011-11-16 Thread hwright
Author: hwright Date: Wed Nov 16 19:37:16 2011 New Revision: 1202852 URL: http://svn.apache.org/viewvc?rev=1202852view=rev Log: Merge r1202807 from trunk: * r1202807 Avoid a potential segfault during merges. Justification: TSVN users have run into this segfault in the wild, see

[Subversion Wiki] Update of CMichaelPilato by CMichaelPilato

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The CMichaelPilato page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/CMichaelPilato New page: ##master-page:HomepageTemplate #format wiki #language en == C.

[Subversion Wiki] Update of MigratingOurNotes by CMichaelPilato

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The MigratingOurNotes page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/MigratingOurNotes?action=diffrev1=4rev2=5 == Logo files == Move to the wiki,

[Subversion Wiki] Trivial Update of CMichaelPilato by CMichaelPilato

2011-11-16 Thread Apache Wiki
Dear Wiki user, You have subscribed to a wiki page or wiki category on Subversion Wiki for change notification. The CMichaelPilato page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/CMichaelPilato?action=diffrev1=1rev2=2 #language en == C. Michael Pilato == -

svn commit: r1202883 - in /subversion/branches/moves-scan-log/subversion: include/svn_wc.h libsvn_client/update.c libsvn_wc/util.c svn/notify.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 21:03:56 2011 New Revision: 1202883 URL: http://svn.apache.org/viewvc?rev=1202883view=rev Log: On the moves-scan-log branch, do progress reporting while scanning for moves. It currently looks as follows: $ svn up -r 1083285 Updating '.': Scanning revision log

svn commit: r1202884 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 21:05:46 2011 New Revision: 1202884 URL: http://svn.apache.org/viewvc?rev=1202884view=rev Log: On the moves-scan-log branch: * subversion/libsvn_client/update.c (scan_moves_log_receiver): Do nothing if no changed path data is available for the revision (e.g.

svn commit: r1202911 - /subversion/branches/moves-scan-log/subversion/svn/notify.c

2011-11-16 Thread stsp
Author: stsp Date: Wed Nov 16 22:24:51 2011 New Revision: 1202911 URL: http://svn.apache.org/viewvc?rev=1202911view=rev Log: On the moves-scan-log branch: * subversion/svn/notify.c (notify): Prepend \r to the line printed when scanning stops. Modified:

Re: svn commit: r1202799 - in /subversion/trunk/subversion/svn: cl.h main.c status-cmd.c status.c

2011-11-16 Thread Daniel Shahaf
cmpil...@apache.org wrote on Wed, Nov 16, 2011 at 17:29:42 -: Author: cmpilato Date: Wed Nov 16 17:29:42 2011 New Revision: 1202799 URL: http://svn.apache.org/viewvc?rev=1202799view=rev Log: For issue #1935 (svn status too verbose with svn:externals definitions), make 'svn status'

svn commit: r1202949 - /subversion/branches/moves-scan-log/subversion/libsvn_client/update.c

2011-11-16 Thread stsp
Author: stsp Date: Thu Nov 17 00:24:48 2011 New Revision: 1202949 URL: http://svn.apache.org/viewvc?rev=1202949view=rev Log: On the moves-scan-log branch, implement an ancestry check between the deleted and copied node in the move detection heuristic. * subversion/libsvn_client/update.c