DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L2778
Version: -current
Since subversion 1.7, the new working copy format doesn't have .svn files
in all subdirecties. Hence, fldiff doesn't recognize that it is a
subversion working copy and refuses to do a diff in subdirectories.
Example (in FLTK root directory):
fldiff CHANGES (works)
fldiff test/buttons.cxx (fails)
I attach a simple (but not really correct?) diff as a proof of concept.
The simple patch is to replace the access() function that checks if a .svn
file exists with a true condition (1). This assumes that this directory is
a svn working copy.
The attached patch works, if called like above, but still fails to
traverse directories and show diffs, as it did with svn 1.6 and before, if
you call it with only one directory, e.g.
fldiff .
(note the trailing "."). It works okay if you click on a particular
directory, but it doesn't show it as different (highlighted), which it did
with an older svn version (at least ISTR). I have no idea how to fix the
latter.
Link: http://www.fltk.org/str.php?L2778
Version: -current
Index: DiffView.cxx
===================================================================
--- DiffView.cxx (revision 450)
+++ DiffView.cxx (working copy)
@@ -963,7 +963,7 @@
{
snprintf(line, sizeof(line), "%s/.svn", file1);
- if (!access(line, 0))
+ if ((1) /* !access(line, 0) */)
{
if (file2)
snprintf(command, sizeof(command), "svn diff -N -r \"%s\" \"%s\"",
@@ -999,7 +999,7 @@
{
strncpy(ptr, ".svn", sizeof(line) - 1 - (ptr - line));
- if (!access(line, 0))
+ if ((1) /* !access(line, 0) */ )
{
const char *diffopt = ignoreblanks() ?
"--diff-cmd diff --extensions '-bBwEu'" : "";
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
