From owner-svn-src-all@FreeBSD.ORG Fri May 10 19:33:02 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AB61296E for ; Fri, 10 May 2013 19:33:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x22d.google.com (mail-pb0-x22d.google.com [IPv6:2607:f8b0:400e:c01::22d]) by mx1.freebsd.org (Postfix) with ESMTP id 853C32EE for ; Fri, 10 May 2013 19:33:02 +0000 (UTC) Received: by mail-pb0-f45.google.com with SMTP id mc8so1095728pbc.32 for ; Fri, 10 May 2013 12:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=fgygQY8EW/LXZ2dxaU1O9Pf5NQ2ZK2fPRBEmJR/4t/E=; b=TBjBCdjmXPJoSiFwYC35b/0FeJ2VxxWkotQjFXMp7OohhO4deEXOdSx2oha+PpqXHc sGj5QLyS0e7YV0KyWlhD95yGvsgEwELWXJNMKnhF8hvpTnPcAyP1UZ8Ii9KY61DFzgIY o4/brJbzQPFsXIz0N78VuKPhiHXfSGsFnoWDI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=fgygQY8EW/LXZ2dxaU1O9Pf5NQ2ZK2fPRBEmJR/4t/E=; b=O6EY53sffw8FIEt8ZZ/7MATmaw6AyLuJ4G12hD1q4+MXjplZRAPM5wUHnd8e5JJnXO BcYllC1OgSNFo0OQwyjJyEKWWu477G0DLzvbpKukW68GmVXn/bxQncYCgKro4Z/ub4cV l53IK3WadNSOdEkZ6+MO1qMoIxRMkygyCmpyDnXIS8V44IUtcg8QXVMQC8wiGVoG8YoC Em4lRaMrsPPySs44GI/pp4ceiTOar6R0es75FY9XlKwjdVpfIpB3px4y+ezXFhJ+Vt2J /BmkC6wGPrsOUpYalvZDW30hx2x5SZmJEOAp6hQ14yaTk5MScrdLlPeVyBp2j8cKcpNK a/Kw== X-Received: by 10.68.97.130 with SMTP id ea2mr18228228pbb.129.1368214382133; Fri, 10 May 2013 12:33:02 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.66.159.97 with HTTP; Fri, 10 May 2013 12:32:32 -0700 (PDT) In-Reply-To: References: <201305101742.r4AHgEbQ079103@svn.freebsd.org> From: Eitan Adler Date: Fri, 10 May 2013 15:32:32 -0400 X-Google-Sender-Auth: UQpqXIHDLUxK2jx18tptaCOkDM8 Message-ID: Subject: Re: svn commit: r250463 - head/usr.sbin/mergemaster To: Garrett Cooper Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQkhXnhPhf65ZOwvh/yRX4AfQSzkZAe6+haujk9Txx9lq+peY2GgWtDra5dE+QhDd0TBaBHm Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 19:33:02 -0000 On 10 May 2013 15:09, Garrett Cooper wrote: > On Fri, May 10, 2013 at 10:42 AM, Eitan Adler wrote: >> Author: eadler >> Date: Fri May 10 17:42:13 2013 >> New Revision: 250463 >> URL: http://svnweb.freebsd.org/changeset/base/250463 >> >> Log: >> Permit relative paths with mergemaster -m >> >> Reviewed by: dim, brooks >> MFC after: 3 days >> >> Modified: >> head/usr.sbin/mergemaster/mergemaster.sh >> >> Modified: head/usr.sbin/mergemaster/mergemaster.sh > > bin/173929 ? Yes, sorry for not including the PR number. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams