From owner-svn-src-head@FreeBSD.ORG Fri May 10 19:33:02 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 716B296D for ; Fri, 10 May 2013 19:33:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x234.google.com (mail-pb0-x234.google.com [IPv6:2607:f8b0:400e:c01::234]) by mx1.freebsd.org (Postfix) with ESMTP id 49FB52ED for ; Fri, 10 May 2013 19:33:02 +0000 (UTC) Received: by mail-pb0-f52.google.com with SMTP id xa7so3002146pbc.39 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=NCEEazMh5GY+xQ3/IzeDQGZjAja6Imm6vJiO3Xmoygj4sQGs03+zlsVLV40Mr1Q/b9 o72ivXxdfByA2+6S7Fiy6S2znVqwxm6eaqPieBIDbVxnY/dg8KoLD6tifMgjJLsnei1E urkStj7nrTgOqwmeWnZuDCiaqzjvOUC3YW9s5bRwQlFAKiAo/xjgvNfiDj8pyP+hcVXl DTD3ZLUFuDcFAYrqHqRz1TdQ1DyKcPij2wEq9JPpmHNfBN2amwrji0+rKdhazwoYvbWD MT35luuS/u9xcueAgHC5cktsFiSWHbwOgB895FDW1R2EUMp8lao5WkYljgcbRvJcMNCk 8Qhg== 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: ALoCoQkM/fzhUAGCHoQf4vxu8dQpyIfplL5fRNjPTTcsbrBeV+Zi3tCWGfboSx/JjdiMwuRs2IKa Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current 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