[cvsnt] RE: cvs merge hang

[Lawson.Reed]

Hi,

Me again... I thought I'd try the -t option on this...

------------------------------------8<------------------------------
d:\library\lib12001\src> d:\cvsnt\cvs -n -t update term_cfg.h
  -> Tracelevel set to 1.  PID is 3400
  -> Session ID is d483e3efee47dca
  -> main loop with CVSROOT=:pserver:engineering\rlawson at fe411894:/work
  -> Sending file 'term_cfg.h' to server
S -> Checking admin file D:/CVSROOT/work/CVSROOT/admin for user
engineering#rlaw
son
S -> checkout (/work/library/lib12001/src/term_cfg.h,v, 1.2, , (function))
S -> unlink(.#term_cfg.h.1.2)
S -> copy(term_cfg.h,.#term_cfg.h.1.2)
S -> chmod(term_cfg.h,100666)
RCS file: /work/library/lib12001/src/term_cfg.h,v
retrieving revision 1.2
S -> checkout (/work/library/lib12001/src/term_cfg.h,v, 1.2, ,
D:\cvsnt\temp\cvs
1B.tmp)
retrieving revision 1.3
S -> checkout (/work/library/lib12001/src/term_cfg.h,v, 1.3, ,
D:\cvsnt\temp\cvs
1C.tmp)
Merging differences between 1.2 and 1.3 into term_cfg.h

-----------------------------------------8<---------------------------------
-
So, looks like it hangs in the merging code? Is that a call to 
another application?

Thanks,

__________________________________
Reed Lawson
IGT Firmware Engineering
(775) 448-0755



> -----Original Message-----
> From: Lawson.Reed 
> Sent: Monday, February 03, 2003 3:09 PM
> To: 'cvsnt at cvsnt.org'
> Subject: cvs merge hang
> 
> 
> Hi,
> 
> I'm not new to cvs, but I am to cvsnt. I'm also new to being
> the server admin. We have been running this as a test case here
> at IGT for a few days. I'm trying to convince a small group 
> of engineers 
> here to start a rebellion to over through PVCS as the 
> established version
> control system here.
> 
> So far the group loves it. But today, the first merge attempt 
> happened and things just hung....
> 
> ------------------------------------------8<------------------
> -----------------
> CVSROOT: :pserver:engineering\rlawson at fe411894:/work 
> (password authentication)
> TCL is available, shell is enabled : help (select and press enter)
> cvs update term_cfg.h (in directory D:\library\lib12001\src\)
> RCS file: /work/library/lib12001/src/term_cfg.h,v
> retrieving revision 1.2
> retrieving revision 1.3
> ------------------------------------------8<------------------
> -----------------
> 
> (then nothing....)
> 
> Here is our setup...
>      CVSNT pserver 1.11.1.3 dated 1/27/03 
>               (I think its "68" but I can't see that 
> anywhere. Out of pure 
>               coincidence, the "68" release date of 1/27 was 
> the day I downloaded 
>               it)
>      WinCVS 1.2 as the client.
> 
> I also tried the CVS command line version in the CVSNT 
> directory with the same result.
> 
> Any help would be great.
> 
> Thanks,
> 
> __________________________________
> Reed Lawson
> IGT Firmware Engineering
> (775) 448-0755
> 
>