Date: Thu, 19 Jun 2008 11:37:35 -0500 From: "Jeremy Messenger" <mezz7@cox.net> To: "Tom Evans" <tevans.uk@googlemail.com> Cc: gnome@freebsd.org, Rene Ladan <r.c.ladan@gmail.com> Subject: Re: CALL FOR TEST: Updates to pixmap, cairo, poppler, and firefox 3.0! Message-ID: <op.ucz8gxul9aq2h7@mezz.mezzweb.com> In-Reply-To: <1213880098.10665.163.camel@localhost> References: <op.ucxiscyq9aq2h7@mezz.mezzweb.com> <48597287.2040907@cyberbotx.com> <1213876731.10665.156.camel@localhost> <e890cae60806190547jf2bf016l22714534c3e69c3e@mail.gmail.com> <1213880098.10665.163.camel@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
<snip> >> One other thing: is it expected that you don't see the marcusmerge >> script >> do a cvs update when invoked as 'sh marcusmerge -m ports-stable' and >> the ports-stable directory already exists? Or is that because there >> aren't >> any changes yet? >> >> Rene > > To update what marcusmerge merges, you can either go to the ports-stable > folder, and do a manual cvs up, and rerun marcusmerge - or possibly run > marcusmerge -m ports-stable -U (I guess, I used cvs up). <snip> I have missed this. I usually do this: 1) marcusmerge -U (to unmerge) 2) Update ports tree by csup. 3) marcusmerge -m ports-stable -u (the -u is update, see manpage that I have pointed in first email) That's it. Cheers, Mezz > Tom -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.ucz8gxul9aq2h7>