On Mon, Dec 17, 2012 at 2:39 PM, David O'Brien <obr...@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 (obr...@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 _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
