From owner-freebsd-arch@FreeBSD.ORG Mon Dec 17 22:53:34 2012 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E9DE83BE; Mon, 17 Dec 2012 22:53:34 +0000 (UTC) (envelope-from davide.italiano@gmail.com) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx1.freebsd.org (Postfix) with ESMTP id 302AF8FC17; Mon, 17 Dec 2012 22:53:34 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id fy27so5898303vcb.13 for ; Mon, 17 Dec 2012 14:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=H6KlhSiR6C2nko2l4TkcphHSJnA30idh3OLsi8lL+jU=; b=om6qrOk72mWOCMhzNyu/HQjEU/aku5j/YI0jvbNdPuRJmhmrJbqBgSesx95FGcnwFl z35cTj3Tm7YzxjLqgFMjjnzqM3MvWyicHlNYvnISJeKCNXknFMb2QCDrWMrJjSlpYqmI WwdF931alSCgb2iIpnq5CyUS4sVNB2oC3/jkRmtOPiHI77S8L+qpbogoyXHPqCYtRw2H U3HKZ7D/zYlmP0pEQe0yROmhAhoJlqc/SYvgXOYEUmH/DFvQT2A1Pf9LooC3tYjdznTj 9XuzyF44FSNjmVLgic7+pFYURf6lyC73wuB+XWL6KuZBg/4BfzeJeww1gOxD8b6T3Xv6 vPDQ== MIME-Version: 1.0 Received: by 10.220.108.79 with SMTP id e15mr25745037vcp.61.1355784813492; Mon, 17 Dec 2012 14:53:33 -0800 (PST) Sender: davide.italiano@gmail.com Received: by 10.58.229.136 with HTTP; Mon, 17 Dec 2012 14:53:33 -0800 (PST) In-Reply-To: <20121217223943.GA88856@dragon.NUXI.org> References: <50CCAB99.4040308@FreeBSD.org> <20121215203458.GA22361@oddish> <50CCE59F.1080107@FreeBSD.org> <50CCE7F6.2090505@FreeBSD.org> <20121217223943.GA88856@dragon.NUXI.org> Date: Mon, 17 Dec 2012 14:53:33 -0800 X-Google-Sender-Auth: xnCvV9VqCGLkO6JabtmmVnG1LTE Message-ID: Subject: Re: [RFC/RFT] calloutng From: Davide Italiano To: obrien@freebsd.org, Alexander Motin , Davide Italiano , freebsd-arch@freebsd.org, FreeBSD Current , Mark Johnston Content-Type: text/plain; charset=ISO-8859-1 X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 22:53:35 -0000 On Mon, Dec 17, 2012 at 2:39 PM, David O'Brien wrote: > On Sat, Dec 15, 2012 at 11:13:26PM +0200, Alexander Motin wrote: >> On 15.12.2012 23:03, Alexander Motin wrote: >> > Sorry, it's my fault. I've tried to save some time on patch generation >> > and forgot about that change in lib/. We haven't touched user-level in >> > our work except that file. Here is patch with that chunk added: >> > http://people.freebsd.org/~mav/calloutng_12_15_1.patch >> >> And one more part I've missed is manual pages update, that probably >> needs more improvements: >> http://people.freebsd.org/~mav/calloutng_12_15.man.patch > > Perhaps use the SCM at what its good at? > > Sync your branch with HEAD and then do an 'svn diff ^/head' and your > branch. > > -- > -- David (obrien@FreeBSD.org) Last time I tried doing that the way you describe, I got an output with tons svn:mergeinfo and I didn't find a way to suppress them if not manually. e.g. Property changes on: usr.bin/procstat ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/usr.bin/procstat:r236314-239017 Index: usr.bin/calendar =================================================================== --- usr.bin/calendar (.../head) (revision 239166) +++ usr.bin/calendar (.../projects/calloutng) (revision 239166) Can you help me in understanding what I did wrong? Thanks