Date: Mon, 17 Dec 2012 14:53:33 -0800 From: Davide Italiano <davide@freebsd.org> To: obrien@freebsd.org, Alexander Motin <mav@freebsd.org>, Davide Italiano <davide@freebsd.org>, freebsd-arch@freebsd.org, FreeBSD Current <freebsd-current@freebsd.org>, Mark Johnston <markjdb@gmail.com> Subject: Re: [RFC/RFT] calloutng Message-ID: <CACYV=-HZydVgom3PZYjjC5BKiGNgObwUYaUhUVuFXKrNnFUOQQ@mail.gmail.com> In-Reply-To: <20121217223943.GA88856@dragon.NUXI.org> References: <50CCAB99.4040308@FreeBSD.org> <20121215203458.GA22361@oddish> <CACYV=-H8Lm_TVn5HnxfX%2Bgvv4trXt-Uj8kbgxH1NL9fnWjBdKw@mail.gmail.com> <50CCE59F.1080107@FreeBSD.org> <50CCE7F6.2090505@FreeBSD.org> <20121217223943.GA88856@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Dec 17, 2012 at 2:39 PM, David O'Brien <obrien@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACYV=-HZydVgom3PZYjjC5BKiGNgObwUYaUhUVuFXKrNnFUOQQ>