[PATCH] Fix issue #1772: correct header for HEAD in "diff -r BASE:HEAD".

Fix half of issue #1772: correct header for HEAD in "diff -r BASE:HEAD".

(close_file): If BASE < HEAD and BASE = WC, the header for HEAD should be
"(revision X)", not "(working copy)".

Index: subversion/libsvn_wc/diff.c
===================================================================
--- subversion/libsvn_wc/diff.c (revision 12127)
+++ subversion/libsvn_wc/diff.c (working copy)
@@ -1184,7 +1184,8 @@
                   svn_wc__empty_file_path (b->wc_path, b->pool),
                   temp_file_path,
                   0,
- entry ? entry->revision : SVN_INVALID_REVNUM,
+ entry ? entry->revision :
+ eb->use_text_base ? eb->revnum : SVN_INVALID_REVNUM,
                   NULL,
                   pristine_mimetype,
                   apr_array_make (pool, 1, sizeof (svn_prop_t)), NULL,

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 3 18:24:29 2004