[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] allow svn_opt_revision_working in svn_client_cat2()

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-03-01 18:56:12 CET

Hi,

The svn_client_cat2() function currently doesn't work correctly if the
revision is specified as svn_opt_revision_working. In the main function,
there's a check for BASE, COMMITTED and UNSPECIFIED revisions to do a
local cat, but that check doesn't use WORKING.
The function cat_local_file() however correctly uses
svn_opt_revision_working to do the job (but of course it's never called
that way).

The attached patch fixes this.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

[[[
Handle svn_opt_revision_working properly in svn_client_cat2().
* subversion/libsvn_client/cat.c : Allow svn_opt_revision_working
]]]
Index: subversion/libsvn_client/cat.c
===================================================================
--- subversion/libsvn_client/cat.c (revision 23293)
+++ subversion/libsvn_client/cat.c (working copy)
@@ -176,9 +176,11 @@
 
   if (! svn_path_is_url(path_or_url)
       && (peg_revision->kind == svn_opt_revision_base
+ || peg_revision->kind == svn_opt_revision_working
           || peg_revision->kind == svn_opt_revision_committed
           || peg_revision->kind == svn_opt_revision_unspecified)
       && (revision->kind == svn_opt_revision_base
+ || revision->kind == svn_opt_revision_working
           || revision->kind == svn_opt_revision_committed
           || revision->kind == svn_opt_revision_unspecified))
     {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 1 18:56:27 2007

This is an archived mail posted to the Subversion Dev mailing list.