You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alexey Dobriyan <ad...@mail.ru> on 2004/12/02 21:38:42 UTC

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

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

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

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c	(revision 12127)
+++ subversion/libsvn_client/diff.c	(working copy)
@@ -2050,6 +2050,11 @@
                             url1,
                             diff_editor, diff_edit_baton, pool));
 
+  if (rev2_is_base)
+    SVN_ERR (svn_client__get_revision_number (&callback_baton->revnum2,
+                                              NULL, NULL,
+                                              revision2, path2, pool));
+
   /* Create a txn mirror of path2;  the diff editor will print
      diffs in reverse.  :-)  */
   SVN_ERR (svn_wc_crawl_revisions (path2, dir_access,


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org