From owner-cvs-all@FreeBSD.ORG  Sat Nov 13 15:38:25 2010
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86D0F1065698;
	Sat, 13 Nov 2010 15:38:25 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 75B408FC0A;
	Sat, 13 Nov 2010 15:38:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oADFcPsP059570;
	Sat, 13 Nov 2010 15:38:25 GMT
	(envelope-from jpaetzel@repoman.freebsd.org)
Received: (from jpaetzel@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oADFcPKV059569;
	Sat, 13 Nov 2010 15:38:25 GMT (envelope-from jpaetzel)
Message-Id: <201011131538.oADFcPKV059569@repoman.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Sat, 13 Nov 2010 15:38:25 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/devel Makefile ports/devel/svnmerge Makefile
 pkg-descr
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2010 15:38:25 -0000

jpaetzel    2010-11-13 15:38:25 UTC

  FreeBSD ports repository

  Modified files:
    devel                Makefile 
  Added files:
    devel/svnmerge       Makefile pkg-descr 
  Log:
  This is a python script to help manage merges in the repository.
  
  This script is part of the Subversion distribution and it is assumed
  that it can be used under the same license terms as Subversion itself.
  
  WWW:    http://subversion.tigris.org/tools_contrib.html#client_side
  
  PR:             ports/152112
  Submitted by:   Tom Judge <tom at tomjudge.com>
  
  Revision  Changes    Path
  1.4113    +1 -0      ports/devel/Makefile
  1.1       +45 -0     ports/devel/svnmerge/Makefile (new)
  1.1       +6 -0      ports/devel/svnmerge/pkg-descr (new)