[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r32339 - trunk/subversion/libsvn_client
From:       lgo () tigris ! org
Date:       2008-07-30 21:15:11
Message-ID: 200807302115.m6ULFBbC014214 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: lgo
Date: Wed Jul 30 14:15:11 2008
New Revision: 32339

Log:
Reverted r32337. This change broke the functionality of choosing
the correct revision for 'svn cat', demonstrated by cat_test 3.

Modified:
   trunk/subversion/libsvn_client/cat.c

Modified: trunk/subversion/libsvn_client/cat.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/cat.c?pathrev=32339&r1=32338&r2=32339
 ==============================================================================
--- trunk/subversion/libsvn_client/cat.c	Wed Jul 30 12:12:56 2008	(r32338)
+++ trunk/subversion/libsvn_client/cat.c	Wed Jul 30 14:15:11 2008	(r32339)
@@ -165,15 +165,17 @@ svn_client_cat2(svn_stream_t *out,
   const char *url;
   svn_stream_t *output = out;
 
-  peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
-                                                        path_or_url);
   /* ### Inconsistent default revision logic in this command. */
   if (peg_revision->kind == svn_opt_revision_unspecified)
     {
+      peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+                                                            path_or_url);
       revision = svn_cl__rev_default_to_head_or_base(revision, path_or_url);
     }
   else
     {
+      peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+                                                            path_or_url);
       revision = svn_cl__rev_default_to_peg(revision, peg_revision);
     }
 

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


[prev in list] [next in list] [prev in thread] [next in thread]