Re: Try to pull, get a PENDING directory

On Thu, 2004-12-02 at 14:16, Chris Wright wrote:
> * Mike Marty (mikem@xxxxxxxxxxx) wrote:
> > I have a repository A cloned from the parent P.  P is several changesets
> > ahead of A.  A has some checked in changesets to its own repository.
> > 
> > When attempting to do a "bk pull" in A, a PENDING directory is created
> > with the changes, but A is not updated.  No RESYNC directory is created.
> > 
> > What is the PENDING directory and how do I proceed?
> 
> Find the file that's edited and save the diff aside (bk pull should have
> told you).  Then unedit, and bk receive . < PENDING/2004-12-02.01 (or
> whatever the name).  then bk resolve.  Now reapply your diff and carry on.
> 

I made sure that no files were edited.  However looking at the output of
bk pull, the problem appears to be a file that "can't find its key".  

=================================== ERROR
====================================
takepatch: can't find key
'alaa@xxxxxxxxxxxxxxxxxxx|ruby/profiler/CompressionProfiler.C|20040309001939|04422|9a1e1146'
 in id cache
takepatch: patch left in PENDING/2004-12-02.02
==============================================================================

Thank you,
Mike

_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@xxxxxxxxxxxx
http://bitmover.com/mailman/listinfo/bitkeeper-users
To unsubscribe from this list, go to the above URL, follow instruction at the 
bottom of the web page.