[cvsnt] RE: merge?

David Somers dsomers at trevezel.com
Thu Jun 2 14:37:55 BST 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


> Check the client/server log (CVS_CLIENT_LOG env) to see what's being
> sent.  There's something that's terminating the list of options before
> cvs starts reading them.  Usually that's cvsrc stuff... can't imagine
> what could do it otherwise.

Here is the command the I run:

# cvs commit -m "merge 2.6.0"

Here's the head of the .in log


Valid-responses ok error Valid-requests Checked-in New-entry Checksum
Copy-file Updated Created Update-existing Merged Patched Rcs-diff
Update-baserev Mode Mod-time Removed Renamed Remove-entry
Set-static-directory Clear-static-directory Set-sticky Clear-sticky Template
Notified Module-expansion Wrapper-rcsOption Clear-rename Rename EntriesExtra
M Mbinary E F MT
valid-requests
UseUnchanged
Root /omz13
server-codepage
client-version CVSNT 2.5.01 (Travis) Build 1976
Valid-RcsOptions bBut{cxkvVlLMDoz
read-cvsignore
read-cvswrappers
read-cvsrc2
Argument prj
Argument -m
Argument merge 2.6.0
Argument --
Directory prj/wxWidgets
/omz13/prj/wxWidgets
Entry /Mingw32-gcc295.patches/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /Mingw32-gcc295.patches/1.1.1.1//////
Directory prj/wxWidgets/contrib
/omz13/prj/wxWidgets/contrib
Entry /configure/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /configure/1.1.1.1//////
Entry /configure.in/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /configure.in/1.1.1.1//////
Directory prj/wxWidgets/contrib/include/wx/canvas
/omz13/prj/wxWidgets/contrib/include/wx/canvas
Entry /bbox.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /bbox.h/1.1.1.1//////
Entry /canvas.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /canvas.h/1.1.1.1//////
Entry /liner.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /liner.h/1.1.1.1//////
Entry /polygon.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /polygon.h/1.1.1.1//////
Directory prj/wxWidgets/contrib/include/wx/xrc
/omz13/prj/wxWidgets/contrib/include/wx/xrc
Entry /xh_all.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /xh_all.h/1.1.1.1//////
Entry /xh_bmp.h/-1.1.1.1/dummy timestamp/-ko/
EntryExtra /xh_bmp.h/1.1.1.1//////
Entry /xh_bmpbt.h/-1.1.1.1/dummy timestamp/-ko/

FYI, I double-checked and the cvsrc in my CVSROOT is no content whatsoever.

And ideas?

David.




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook