From owner-svn-src-user@FreeBSD.ORG  Thu Jul 16 21:54:41 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CA0B106564A;
	Thu, 16 Jul 2009 21:54:41 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B2378FC08;
	Thu, 16 Jul 2009 21:54:41 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6GLsf3E042578;
	Thu, 16 Jul 2009 21:54:41 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6GLsfhe042576;
	Thu, 16 Jul 2009 21:54:41 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200907162154.n6GLsfhe042576@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 16 Jul 2009 21:54:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195728 - user/des/fmerge
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jul 2009 21:54:41 -0000

Author: des
Date: Thu Jul 16 21:54:41 2009
New Revision: 195728
URL: http://svn.freebsd.org/changeset/base/195728

Log:
  Fix arg parsing

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Thu Jul 16 21:13:04 2009	(r195727)
+++ user/des/fmerge/fmerge.pl	Thu Jul 16 21:54:41 2009	(r195728)
@@ -163,13 +163,13 @@ MAIN:{
     if ($ARGV[0] eq 'all') {
 	shift;
     } else {
-	while (@ARGV && $ARGV[0] =~ m/^r?\d+(,r?\d+)*$/) {
+	while (@ARGV && $ARGV[0] =~ m/^[cr]?\d+([-:][cr]?\d+)?(,[cr]?\d+([-:][cr]?\d+)?)*$/) {
 	    foreach my $rev (split(',', $ARGV[0])) {
 		if ($rev =~ m/^[cr]?(\d+)$/) {
 		    push(@revs, [ $1 - 1, $1 ]);
 		} elsif ($rev =~ m/^[cr]?-(\d+)$/) {
 		    push(@revs, [ $1, $1 - 1 ]);
-		} elsif ($rev =~ m/^r?(\d+)[-:](\d+)$/) {
+		} elsif ($rev =~ m/^[cr]?(\d+)[-:][cr]?(\d+)$/) {
 		    push(@revs, [ $1, $2 ]);
 		} else {
 		    usage();