25929 - checkout/update from cvs-mirror won't merge changes

Status: RESOLVED FIXED

(mozilla.org Graveyard :: Server Operations, task, P3)

Description

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

This problem was occuring yesterday.  I don't want to test it right now because
I don't want to mess up my tree.  However, if nothing has changed, it probably
still exists...

Yesterday evening, a cvs checkout or update from cvs-mirror.mozilla.org didn't
merge changes into a modified file.  It instead quit with the following
error:

david@dbaron ~/mozilla/src/mozilla/tools/jprof > cvs update libmalloc.cpp
RCS file: /cvsroot/mozilla/tools/jprof/libmalloc.cpp,v
retrieving revision 1.1
retrieving revision 1.3
Merging differences between 1.1 and 1.3 into libmalloc.cpp
cvs server: could not open output file: No such file or directory
cvs server: subsidiary diff failed
david@dbaron ~/mozilla/src/mozilla/tools/jprof >

cvs.mozilla.org works fine on the same file.  The last two lines from
above are replaced by the one line:
M libmalloc.cpp


This was on the HEAD and it occured both in SeaMonkeyAll and in tools/jprof.

Comment 1

[Risto Kotalampi]

This looks similar to what imoT reported in irc. There was a missing directory 
in chroot environment (/var/tmp, /tmp/ wasn't enough). So I believe this is 
fixed now. Please reopen the ticket if this is not the case.