From owner-svn-src-user@FreeBSD.ORG  Wed Jun 17 11:38:16 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 A885E1065672;
	Wed, 17 Jun 2009 11:38:16 +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 9705E8FC1C;
	Wed, 17 Jun 2009 11:38:16 +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 n5HBcGwI074180;
	Wed, 17 Jun 2009 11:38:16 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HBcGcJ074178;
	Wed, 17 Jun 2009 11:38:16 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906171138.n5HBcGcJ074178@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 17 Jun 2009 11:38:16 +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: r194349 - 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: Wed, 17 Jun 2009 11:38:17 -0000

Author: des
Date: Wed Jun 17 11:38:16 2009
New Revision: 194349
URL: http://svn.freebsd.org/changeset/base/194349

Log:
  Fix parsing of from / into.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed Jun 17 11:34:13 2009	(r194348)
+++ user/des/fmerge/fmerge.pl	Wed Jun 17 11:38:16 2009	(r194349)
@@ -145,15 +145,17 @@ sub usage() {
 MAIN:{
     while (@ARGV) {
 	if ($ARGV[0] eq 'already') {
+	    shift;
 	    $already++;
 	} elsif ($ARGV[0] eq 'debug') {
+	    shift;
 	    $debug++;
 	} elsif ($ARGV[0] eq 'pretend') {
+	    shift;
 	    $pretend++;
 	} else {
 	    last;
 	}
-	shift;
     }
     if (@ARGV < 1) {
 	usage();
@@ -177,37 +179,29 @@ MAIN:{
 	}
     }
 
-    if (@ARGV > 0) {
-	if (@ARGV < 2) {
-	    usage();
-	}
-	if ($ARGV[0] ne 'from') {
-	    usage();
-	}
-	shift;
-	$branch = $ARGV[0];
-	shift;
-    }
-
-    if (@ARGV > 0) {
-	if (@ARGV < 2) {
-	    usage();
-	}
-	if ($ARGV[0] ne 'into') {
-	    usage();
-	}
-	shift;
-	$target = $ARGV[0];
-	shift;
-	if (!-d $target) {
+    while (@ARGV) {
+	if ($ARGV[0] eq 'from') {
+	    shift;
+	    if (@ARGV < 1) {
+		usage();
+	    }
+	    $branch = $ARGV[0];
+	    shift;
+	} elsif ($ARGV[0] eq 'into') {
+	    shift;
+	    if (@ARGV < 1) {
+		usage();
+	    }
+	    $target = $ARGV[0];
+	    shift;
+	    if (!-d $target) {
+		usage();
+	    }
+	} else {
 	    usage();
 	}
     }
 
-    if (@ARGV > 0) {
-	usage();
-    }
-
     examine();
     fmerge();
 }