From owner-svn-src-user@FreeBSD.ORG  Wed Jan 27 14:17:33 2010
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 668791065672;
	Wed, 27 Jan 2010 14:17:33 +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 5694F8FC16;
	Wed, 27 Jan 2010 14:17:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0REHXG9037278;
	Wed, 27 Jan 2010 14:17:33 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0REHXlu037276;
	Wed, 27 Jan 2010 14:17:33 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201001271417.o0REHXlu037276@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 27 Jan 2010 14:17:33 +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: r203069 - 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, 27 Jan 2010 14:17:33 -0000

Author: des
Date: Wed Jan 27 14:17:33 2010
New Revision: 203069
URL: http://svn.freebsd.org/changeset/base/203069

Log:
  When merging multiple ranges, merge them in chronological order, not
  reverse chronological.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Wed Jan 27 11:54:42 2010	(r203068)
+++ user/des/fmerge/fmerge.pl	Wed Jan 27 14:17:33 2010	(r203069)
@@ -178,9 +178,9 @@ sub revs2ranges() {
 	    next;
 	} else {
 	    if ($revs{$m} == +1) {
-		push(@ranges, [ $m - 1, $n ]);
+		unshift(@ranges, [ $m - 1, $n ]);
 	    } elsif ($revs{$m} == -1) {
-		push(@ranges, [ $n, $m - 1 ]);
+		unshift(@ranges, [ $n, $m - 1 ]);
 	    }
 	    $m = $n = $i;
 	}