Just do "cvs up" twice. The first time you'll get all the updates and messages whizzing by, the second time, only the conflicts and your changes will show up.
HTH -----Original Message----- Date: 21 Feb 2003 07:55:55 -0500 From: Steven Tryon <[EMAIL PROTECTED]> To: richard blair <[EMAIL PROTECTED]> Cc: [EMAIL PROTECTED] Subject: Re: cvs update info Message-ID: <[EMAIL PROTECTED]> In-Reply-To: <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]> Content-Type: text/plain MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: list Message: 8 Rich, cvs update >update.txt ? cvs update | less ? Steve On Thu, 2003-02-20 at 18:57, richard blair wrote: > I perform a cvs update on a large directory structure, and a conflict > happens, but the file it happened on is too far up to scroll to. Does > anyone know how to retrieve that information? In other words, how do I > find out which files were in conflict after I have performed an update? > > Rich -- Steven Tryon, CIBER @ Xerox Webmaster, Xerox Global Service Net 8*221-7719 / 585-231-7719 ------------------------------ Date: Fri, 21 Feb 2003 05:19:34 -0800 (PST) From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Cc: [EMAIL PROTECTED] Subject: Re: cvs update info Message-ID: <[EMAIL PROTECTED]> In-Reply-To: <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]> Content-Type: multipart/mixed; boundary="----=_20030221051934_32271" MIME-Version: 1.0 Precedence: list Message: 9 ------=_20030221051934_32271 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Try using the attached perl script. It cleans up the display quite nicely, with a summary at the end for things like conflicts, files in the way, etc. > I perform a cvs update on a large directory structure, and a conflict > happens, but the file it happened on is too far up to scroll to. Does > anyone know how to retrieve that information? In other words, how do I > find out which files were in conflict after I have performed an update? > > Rich > > > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs ------=_20030221051934_32271 Content-Type: application/octet-stream; name="cvs_update_display.pl" Content-Disposition: attachment; filename="cvs_update_display.pl" Content-Transfer-Encoding: base64 IyEvdXNyL2xvY2FsL2Jpbi9wZXJsCiMgLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiMgPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSov CgogICBAbG9jYWxtb2QgPSAoKTsKICAgQGxvY2FsYWRkID0gKCk7CiAgIEBjb25mbGljdHMgPSAo KTsKICAgQG1vdmVhd2F5ID0gKCk7CiAgIEBlcnJvcnMgPSAoKTsKICAgd2hpbGUoPD4pIHsKICAg ICAgaWYgKCAvXlUgKC4rKS8gKSB7CiAgICAgICAgICRuYW1lID0gJDE7CiAgICAgICAgIHByaW50 ICJVcGRhdGluZyAkbmFtZVxuIjsKICAgICAgfSBlbHNpZiAoL15QICguKykvICkgewogICAgICAg ICAkbmFtZSA9ICQxOwogICAgICAgICBwcmludCAiVXBkYXRpbmcgJG5hbWVcbiI7CiAgICAgIH0g ZWxzaWYgKC9eTWVyZ2luZyAoLispLyApIHsKICAgICAgICAgd2hpbGUoPD4pIHsKICAgICAgICAg ICAgaWYgKC9eTSAoLispLyApIHsKICAgICAgICAgICAgICAgJG5hbWUgPSAkMTsKICAgICAgICAg ICAgICAgcHJpbnQgIlVwZGF0aW5nICRuYW1lXG4iOwogICAgICAgICAgICAgICBsYXN0OwogICAg ICAgICAgICB9IGVsc2lmICgvXkMgKC4rKS8gKSB7CiAgICAgICAgICAgICAgICRuYW1lID0gJDE7 CiAgICAgICAgICAgICAgIHByaW50ICJVcGRhdGluZyAkbmFtZVxuIjsKICAgICAgICAgICAgICAg cHVzaCBAY29uZmxpY3RzLCAkbmFtZTsKICAgICAgICAgICAgICAgbGFzdDsKICAgICAgICAgICAg fQogICAgICAgICB9CiAgICAgIH0gZWxzaWYgKC9eTSAoLispLyApIHsKICAgICAgICAgJG5hbWUg PSAkMTsKICAgICAgICAgcHVzaCBAbG9jYWxtb2QsICRuYW1lOwogICAgICB9IGVsc2lmICgvXkMg KC4rKS8gKSB7CiAgICAgICAgICRuYW1lID0gJDE7CiAgICAgICAgIHByaW50ICJVcGRhdGluZyAk bmFtZVxuIjsKICAgICAgICAgcHVzaCBAY29uZmxpY3RzLCAkbmFtZTsKICAgICAgfSBlbHNpZiAo L15BICguKykvICkgewogICAgICAgICAkbmFtZSA9ICQxOwogICAgICAgICBwdXNoIEBsb2NhbGFk ZCwgJG5hbWU7CiAgICAgIH0gZWxzaWYgKC9eY3ZzIHVwZGF0ZTogbW92ZSBhd2F5IChbXjtdKyk7 LykgewogICAgICAgICAkbmFtZSA9ICQxOwogICAgICAgICBwdXNoIEBtb3ZlYXdheSwgJG5hbWU7 CiAgICAgICAgICRuZXh0bGluZSA9IDw+OwogICAgICB9IGVsc2lmICgvXmN2cyB1cGRhdGU6IChb XlxzXSspIGlzIG5vIGxvbmdlciBpbiB0aGUgcmVwb3NpdG9yeS8pIHsKICAgICAgICAgJG5hbWUg PSAkMTsKICAgICAgICAgcHJpbnQgIkRlbGV0aW5nOiAkbmFtZVxuIjsKICAgICAgfSBlbHNpZiAo L15jdnMgXFt1cGRhdGUgYWJvcnRlZFxdOiAoLispLyApIHsKICAgICAgICAgJG1lc3NhZ2UgPSAk MTsKICAgICAgICAgcHVzaCBAZXJyb3JzLCAkbWVzc2FnZTsKICAgICAgfSBlbHNpZiAoL3dhaXRp bmcgZm9yLykgewogICAgICAgICBwcmludCAkXzsKICAgICAgfQogICB9CiAgIGlmKCAkI2NvbmZs aWN0cyA+IC0xICkgewogICAgICB1bnNoaWZ0IEBjb25mbGljdHMsICJUaGUgZm9sbG93aW5nIGZp bGVzIGhhZCBtZXJnZSBjb25mbGljdHM6IjsKICAgICAgcHJpbnQgam9pbigiXG4gLS0tICIsQGNv bmZsaWN0cyk7CiAgICAgIHByaW50ICJcbiI7CiAgIH0KICAgaWYoICQjY29uZmxpY3RzID4gLTEg JiYgJCNtb3ZlYXdheSA+IC0xKSB7CiAgICAgIHByaW50ICJcbiI7CiAgIH0KICAgaWYoICQjbW92 ZWF3YXkgPiAtMSApIHsKICAgICAgdW5zaGlmdCBAbW92ZWF3YXksICJUaGUgZm9sbG93aW5nIGZp bGVzIGFyZSBpbiB0aGUgd2F5OiI7CiAgICAgIHByaW50IGpvaW4oIlxuIC0tLSAiLEBtb3ZlYXdh eSk7CiAgICAgIHByaW50ICJcbiI7CiAgIH0KICAgaWYoICQjbW92ZWF3YXkgPiAtMSAmJiAkI2Vy cm9ycyA+IC0xKSB7CiAgICAgIHByaW50ICJcbiI7CiAgIH0KICAgaWYoICQjZXJyb3JzID4gLTEg KSB7CiAgICAgIHVuc2hpZnQgQGVycm9ycywgIlRoZSBmb2xsb3dpbmcgZXJyb3JzIG9jY3VycmVk OiI7CiAgICAgIHByaW50IGpvaW4oIlxuIC0tLSAiLEBlcnJvcnMpOwogICAgICBwcmludCAiXG4i OwogICB9CiAgIGlmKCAkI2Vycm9ycyA+IC0xICYmICQjbG9jYWxtb2QgPiAtMSkgewogICAgICBw cmludCAiXG4iOwogICB9CiAgIGlmKCAkI2xvY2FsbW9kID4gLTEgKSB7CiAgICAgIHVuc2hpZnQg QGxvY2FsbW9kLCAiVGhlIGZvbGxvd2luZyBmaWxlcyBhcmUgbW9kaWZpZWQgaW4geW91ciB2aWV3 OiI7CiAgICAgIHByaW50IGpvaW4oIlxuIC0tLSAiLEBsb2NhbG1vZCk7CiAgICAgIHByaW50ICJc biI7CiAgIH0KICAgaWYoICQjbG9jYWxtb2QgPiAtMSAmJiAkI2xvY2FsYWRkID4gLTEpIHsKICAg ICAgcHJpbnQgIlxuIjsKICAgfQogICBpZiggJCNsb2NhbGFkZCA+IC0xICkgewogICAgICB1bnNo aWZ0IEBsb2NhbGFkZCwgIlRoZSBmb2xsb3dpbmcgZmlsZXMgYXJlIGFkZGVkIGluIHlvdXIgdmll dzoiOwogICAgICBwcmludCBqb2luKCJcbiAtLS0gIixAbG9jYWxhZGQpOwogICAgICBwcmludCAi XG4iOwogICB9Cgo= ------=_20030221051934_32271-- ------------------------------ Date: Fri, 21 Feb 2003 05:33:32 -0800 (PST) From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Cc: [EMAIL PROTECTED] Subject: Re: How send log message to specific program from loginfo, commitinfo or else admin files. Message-ID: <[EMAIL PROTECTED]> In-Reply-To: <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]> Content-Type: text/plain; charset=iso-8859-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Message: 10 The log message as well as what files were modified and what directory can be read in from standard input. > Hi, > > I know that is possible to run extarnal program from loginfo file > durring commit operation and pass parameters such as %v %V %s. > In our development team we want to find out solution to pass information > from log > message as parametr to external program wich run from cvsroot/loginfo > file. > > We want to use special program or plug-in to insert information from log > message to database wich storege information about bugs and changes. > > Any resolutions ? > > Regards, > > Martin. > > > > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs ------------------------------ _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs End of Info-cvs Digest, Vol 3, Issue 36 *************************************** _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
