Author: jcorvel
Date: Fri Jul 6 22:46:15 2012
New Revision: 1358465
URL: http://svn.apache.org/viewvc?rev=1358465&view=rev
Log:
* subversion/svn/file-merge.c
(get_term_width): Get console width on Windows using
GetConsoleScreenBufferInfo. This seems to work for cmd.exe as well as for
cygw
Author: stefan2
Date: Fri Jul 6 22:12:12 2012
New Revision: 1358447
URL: http://svn.apache.org/viewvc?rev=1358447&view=rev
Log:
* subversion/libsvn_fs_fs/tree.c
(svn_fs_fs__verify_root): improve error messages
Suggested by: blair
Modified:
subversion/trunk/subversion/libsvn_fs_fs/tree.c
Author: stefan2
Date: Fri Jul 6 22:07:12 2012
New Revision: 1358445
URL: http://svn.apache.org/viewvc?rev=1358445&view=rev
Log:
Prepare revprop reading and writing code for packed revprop support.
Move the non-packed revprop code to specific sub-functions and factor
out common code parts. Do the
Author: stsp
Date: Fri Jul 6 20:19:44 2012
New Revision: 1358401
URL: http://svn.apache.org/viewvc?rev=1358401&view=rev
Log:
Allow exiting from the interactive file merge tool without having to
postpone every conflicting section in the file.
Suggested by: jcorvel
* subversion/svn/file-merge.c
Author: stefan2
Date: Fri Jul 6 20:04:28 2012
New Revision: 1358393
URL: http://svn.apache.org/viewvc?rev=1358393&view=rev
Log:
Follow-up to r1358385. Fix Windows build.
* subversion/libsvn_fs_fs/fs_fs.c
(try_stringbuf_from_file): fix misplaced #endif
Modified:
subversion/trunk/subversion
Author: stefan2
Date: Fri Jul 6 19:54:25 2012
New Revision: 1358385
URL: http://svn.apache.org/viewvc?rev=1358385&view=rev
Log:
FSFS refactoring. Replace the while-macro code for recoverable
file errors with proper functions.
* subversion/libsvn_fs_fs/fs_fs.c
(RETRY_RECOVERABLE, IGNORE_RECOVE
Author: stsp
Date: Fri Jul 6 19:46:06 2012
New Revision: 1358374
URL: http://svn.apache.org/viewvc?rev=1358374&view=rev
Log:
* subversion/svn/file-merge.c
(svn_cl__merge_file): Do not operate directly on the file at merged_path,
but on a temporary file and rename that on top of the merged_pa
Author: stsp
Date: Fri Jul 6 18:27:30 2012
New Revision: 1358337
URL: http://svn.apache.org/viewvc?rev=1358337&view=rev
Log:
* subversion/svn/file-merge.c
(get_term_width): Put braces around a multi-line if statement body.
Also fix some whitespace mis-formatting.
Modified:
subversion/tr
Author: stsp
Date: Fri Jul 6 18:17:12 2012
New Revision: 1358328
URL: http://svn.apache.org/viewvc?rev=1358328&view=rev
Log:
* subversion/svn/file-merge.c
(get_term_width): Always return at least 80 columns width. Other output
from 'svn' tends to assume at least 80 columns width, too (e.g. t
Author: stefan2
Date: Fri Jul 6 18:06:31 2012
New Revision: 1358324
URL: http://svn.apache.org/viewvc?rev=1358324&view=rev
Log:
FSFS refactoring. Make it easy to read a number from a stream.
* subversion/libsvn_fs_fs/fs_fs.c
(read_number_from_stream): new utility function
(get_packed_offset)
Author: stefan2
Date: Fri Jul 6 18:04:09 2012
New Revision: 1358322
URL: http://svn.apache.org/viewvc?rev=1358322&view=rev
Log:
Relax overly strict consistency check that is not covered by the FSFS
format specification.
* subversion/libsvn_fs_fs/tree.c
(svn_fs_fs__verify_root): fix test and ad
Author: stefan2
Date: Fri Jul 6 17:45:35 2012
New Revision: 1358316
URL: http://svn.apache.org/viewvc?rev=1358316&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(write_config): make the defaults in the settings file match our internal
defaults
Modified:
subversion/trunk/subversion/libsvn
Author: stsp
Date: Fri Jul 6 17:35:03 2012
New Revision: 1358315
URL: http://svn.apache.org/viewvc?rev=1358315&view=rev
Log:
Make the interactive merge tool side-by-side display use the full terminal
width on platforms that support either getenv("COLUMNS") or the TIOCGWINSZ
ioctl() call. For othe
Author: stsp
Date: Fri Jul 6 12:53:00 2012
New Revision: 1358173
URL: http://svn.apache.org/viewvc?rev=1358173&view=rev
Log:
* publish/docs/release-notes/1.8.html: Document a couple of conflict
resolution enhancements in the 'svn' client.
Modified:
subversion/site/publish/docs/release-not
Author: stsp
Date: Fri Jul 6 11:17:03 2012
New Revision: 1358129
URL: http://svn.apache.org/viewvc?rev=1358129&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(open_editor): Print the root cause of errors when the external editor
fails to run, so we print the proper message if error trac
Author: stsp
Date: Fri Jul 6 11:11:35 2012
New Revision: 1358122
URL: http://svn.apache.org/viewvc?rev=1358122&view=rev
Log:
* subversion/svn/file-merge.c
(LINE_DISPLAY_WIDTH): Increase to fill 78 columns.
(SEP_STRING): Adjust to match above change.
Modified:
subversion/trunk/subversion/
Author: stsp
Date: Fri Jul 6 11:04:14 2012
New Revision: 1358117
URL: http://svn.apache.org/viewvc?rev=1358117&view=rev
Log:
* subversion/svn/file-merge.c
(edit_chunk): If no editor could be found, print the correct error message
even if error tracing is enabled. This used to print "traced c
Author: stsp
Date: Fri Jul 6 10:59:07 2012
New Revision: 1358114
URL: http://svn.apache.org/viewvc?rev=1358114&view=rev
Log:
* subversion/svn/file-merge.c
(merge_chunks): Use fewer lines of code to do the same thing.
No functional change.
Modified:
subversion/trunk/subversion/svn/file-m
Author: stsp
Date: Fri Jul 6 10:53:25 2012
New Revision: 1358113
URL: http://svn.apache.org/viewvc?rev=1358113&view=rev
Log:
* subversion/svn/file-merge.c
(merge_chunks): If launching the editor fails, stay within the merge tool
prompt rather than dropping back to the interactive conflict pr
Author: stsp
Date: Fri Jul 6 10:45:21 2012
New Revision: 1358110
URL: http://svn.apache.org/viewvc?rev=1358110&view=rev
Log:
Promote two identical readline() helper functions to one svn_io_file_readline()
public API function.
* subversion/include/svn_io.h
(svn_io_file_readline): Declare.
*
Author: stsp
Date: Fri Jul 6 10:22:34 2012
New Revision: 1358105
URL: http://svn.apache.org/viewvc?rev=1358105&view=rev
Log:
* CHANGES: List the built-in file merge tool as minor improvement for 1.8.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apac
Author: stsp
Date: Fri Jul 6 10:06:38 2012
New Revision: 1358101
URL: http://svn.apache.org/viewvc?rev=1358101&view=rev
Log:
Cosmetic tweaks for the interactive merge tool side-by-side display.
* subversion/svn/file-merge.c
(prepare_line_for_display): Always use the LINE_DISPLAY_WIDTH constant
Author: stsp
Revision: 1358093
Modified property: svn:log
Modified: svn:log at Fri Jul 6 09:38:48 2012
--
--- svn:log (original)
+++ svn:log Fri Jul 6 09:38:48 2012
@@ -1,4 +1,4 @@
-Add chunk editiing support to the new
Author: stsp
Date: Fri Jul 6 09:38:11 2012
New Revision: 1358093
URL: http://svn.apache.org/viewvc?rev=1358093&view=rev
Log:
Add chunk editiing support to the new internal file merge tool.
* subversion/svn/cl.h
(svn_cl__merge_file): Add editor_cmd parameter to declaration.
* subversion/svn/co
Author: stsp
Date: Fri Jul 6 09:31:16 2012
New Revision: 1358091
URL: http://svn.apache.org/viewvc?rev=1358091&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(launch_resolver): Suggest trying the "(m) merge" option if an error ocurred
while launching an external merge tool.
Modified:
Author: stsp
Date: Fri Jul 6 09:29:13 2012
New Revision: 1358088
URL: http://svn.apache.org/viewvc?rev=1358088&view=rev
Log:
* subversion/svn/file-merge.c
(read_diff_chunk): Do not drop empty lines read from the chunk.
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subve
Author: stsp
Date: Fri Jul 6 08:28:50 2012
New Revision: 1358072
URL: http://svn.apache.org/viewvc?rev=1358072&view=rev
Log:
* subversion/svn/file-merge.c
(merge_chunks): Cosmetic tweaks: Properly align the separator line
and indent both left and right version of the chunk in the same way.
27 matches
Mail list logo
