Re: can't commit uncomitted changes

At 5:22 AM -0500 12/21/04, Wayne Scott wrote:
> From: Victor Eijkhout <eijkhout@xxxxxxxxxx>
> >  BitKeeper/deleted/SCCS/s..del-cavity04_sol.mtx~8ec48d60319f3a9b has
> >  uncommitted changes
>
> That is kind of funny.  You have modifications in a deleted file and
> your pull is trying to update that file.  (Both are unusual.)
>
>
>  $ bk unedit BitKeeper/deleted/SCCS/s..del-cavity04_sol.mtx~8ec48d60319f3a9b
>
> will throw away your local changes to that file.
>
> -Wayne

Thanks. I'll file that away for next time. I'm afraid that in the 
meantime I've been reading the helpfile (always a bad idea), and 
"rmgone" sounded good to me. Did that, then pull/push. Unfortunately 
on _another_ clone I now get the following:

earth> bk pull
Pull salsa@xxxxxxxxxxxxxx:salsa-src -> 
file://home/eijkhout/Software/Salsa/salsa
salsa@xxxxxxxxxxxxxx's password:
---------------------- Receiving the following csets -----------------------
1.237 1.236
----------------------------------------------------------------------------
cset: cannot find

victor@xxxxxxxxxxxxxxxxxxxxxx|BitKeeper/deleted/.del-cavity04_sol.mtx~8ec48d60319f3a9b|20041221031803|18887 
in
        BitKeeper/deleted/SCCS/s..del-cavity04_sol.mtx~8ec48d60319f3a9b
File named by key

efuentes@xxxxxxxxxxxxxxxxx|sans/analysis/cavity04_sol.mtx|20030603173252|49992|8ec48d60319f3a9b
        is missing and key is not in a committed gone delta, aborting.
adler32 aborting
ChangeSet fnext: No such file or directory

=================================== ERROR ====================================
takepatch: missing checksum line in patch, aborting.
==============================================================================

1508 bytes uncompressed to 5761, 3.82X expansion
cmd_pull_part2: makepatch failed; status = 1


Trying the rmgone again I did:

earth> bk rmgone
rm -f lib/SCCS/s.Makefile
rm -f lib/Makefile
rm -f lib/SCCS/s.Makefile.clean
rm -f lib/Makefile.clean
rm -f petsc/SCCS/s.petsc_itmeth.o
rm -f petsc/petsc_itmeth.o
rm -f sans/analysis/SCCS/s.cavity04_sol.mtx
rm -f sans/analysis/cavity04_sol.mtx


but I keep getting the same error on the pull.
--
Victor Eijkhout <eijkhout@xxxxxxxxxx>, 329 Claxton, Comp Sci, UT, 
Knoxville TN 37996.
tel: 865 974 9308 (W), 865 673 6998 (H), 865 974 8296 (F)
http://www.cs.utk.edu/~eijkhout/
_______________________________________________
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.