On Mon, Nov 04, 2013 at 02:03:04AM -0600, Ryan Schmidt wrote:
>
> On Nov 4, 2013, at 01:35, Stefan Sperling wrote:
>
> > This seems be a bug in the diff code with handling of moves inside copies.
> > I've filed http://subversion.tigris.org/issues/show_bug.cgi?id=4444
>
> You sure that’s the ticket number? It’s usually at least 6 figures.
>
> http://www.youtube.com/watch?v=dKDBJvwreD8
I'm not usually on a rush to the pub on Monday mornings so 4 figures will do :)
You can apply this patch to fix the problem:
Index: subversion/libsvn_wc/diff_editor.c
===================================================================
--- subversion/libsvn_wc/diff_editor.c (revision 1538519)
+++ subversion/libsvn_wc/diff_editor.c (working copy)
@@ -953,6 +953,11 @@ svn_wc__diff_local_only_file(svn_wc__db_t *db,
db, local_abspath,
scratch_pool, scratch_pool));
+ /* If comparing against WORKING, skip entries that are
+ schedule-deleted - they don't really exist. */
+ if (!diff_pristine && status == svn_wc__db_status_deleted)
+ return SVN_NO_ERROR;
+
assert(kind == svn_node_file
&& (status == svn_wc__db_status_normal
|| status == svn_wc__db_status_added
Received on 2013-11-04 09:23:13 CET