Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/mergesvn

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/mergesvn

Author sunny256
Full name Øyvind A. Holm
Date 2007-04-07 06:11:36 PDT
Message User: sunny256
Date: 2007-04-07 06:11:36-0700
Log:
 r198 | sunny256 | 2007-04-03 11:52:37 +0000 (Tue, 03 Apr 2007) | 4 lines
 
 * /trunk/src/mergesvn
   Added a Vim fold in legal_revision() and comments with function names
   where missing.

File Changes:

Directory: /svnutils/trunk/src/
===============================

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.19​&r2=1.20
Delta lines: +9 -7
-------------------
--- mergesvn 2007-04-07 06:10:51-0700 1.19
+++ mergesvn 2007-04-07 06:11:33-0700 1.20
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $
+# $Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -34,7 +34,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -146,6 +146,7 @@
 }
 
 sub legal_revision {
+ # Check that a string is a legal revision number {{{
     my $Rev = shift;
     my $Retval = 1;
 
@@ -153,7 +154,8 @@
         $Retval = 0;
     }
     return($Retval);
-}
+ # }}}
+} # legal_revision()
 
 sub set_mergesvn_prop {
     # Define the $PROP_NAME property for an element. Finds the highest
@@ -187,7 +189,7 @@
     }
     mysyst($CMD_SVN, "propset", $PROP_NAME, "$highest_rev $Source", $File);
     # }}}
-}
+} # set_mergesvn_prop()
 
 sub find_conflict {
     # Scan a specific revision range for the first merge conflict and
@@ -345,7 +347,7 @@
 
     mysyst($CMD_SVN, "log", "-r$Start:$End", $File);
     # }}}
-}
+} # log_range()
 
 sub deb_wait {
     # Wait until Enter is pressed if --debug {{{
@@ -440,7 +442,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $
+$Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -568,4 +570,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $
+# End of file $Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/mergesvn sunny256 Øyvind A. Holm 2007-04-07 06:11:36 PDT
Messages per page: