"bk pull" is not updating my local repository

I've made some changes to the code in my local repository.  I know that 
other people have made changes to the parent, so I want to pick up the 
updated files and merge them into my current repository.  I tried the 
"bk pull" command, but the files in my repository are not updated.  I 
only want bk to update the files I have not yet edited, but it appears 
to reject the 'pull' command because I have files checked out.  That 
doesn't make any sense to me, because how am I supposed to keep my 
repository up-to-date while other people are checking in their changes?

Here's the output I get:

Pull cvssrv:/usr/ammasso/bk_repos/starcore_1-2
   -> file://home/ttabi/sb/starcore
Warning: No xauth data; using fake authentication data for X11 forwarding.
---------------------- Receiving the following csets -----------------------
1.1160 1.1159 1.1158 1.1154.1.2 1.1154.1.1 1.1157 1.1156
1.1155 1.1154 1.1153 1.1146.1.65 1.1146.1.64 1.1146.36.1
1.1146.1.63 1.1146.1.62 1.1146.35.1 1.1146.1.61 1.1146.1.60
1.1146.34.1 1.1146.1.59 1.1146.1.58 1.1146.1.57 1.1146.33.1
1.1146.1.56 1.1146.31.2 1.1146.1.55 1.1146.1.54 1.1152 1.1151
1.1150 1.1149 1.1148 1.1147 1.1075.74.1
----------------------------------------------------------------------------
ChangeSet: 0 deltas
software/Build: 0 deltas
software/adapter/cepheus/fw/netinet/rdma_input.c: 0 deltas
software/header_gcc.mk: 0 deltas
software/kitting/ccil_bin.bom: 0 deltas
software/kitting/config_IP: 0 deltas
software/kitting/install_fw: 0 deltas
software/mark_build: 0 deltas
software/adapter/etherboot/src/Makefile.main: 0 deltas
software/adapter/etherboot/src/drivers/net/amm_ccore.c: 0 deltas
software/host/linux/usr/ccroute/Makefile: 0 deltas
software/host/linux/usr/ccroute/ccroute.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_barrier.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_bcast.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_checks.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_common.h: 0 deltas
software/host/linux/usr/ccpt/ccpt_display.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_init.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_main.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_pingping.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_pingpong.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_ring.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_streaming.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_wrs.c: 0 deltas
software/host/linux/usr/ccpt/ccpt_wrs.h: 0 deltas
software/host/linux/usr/ccpt/docs/ccil-perf.txt: 0 deltas
software/host/linux/usr/ccpt/tests.sh: 0 deltas
software/host/linux/usr/tests/datatest/dt_run.pl: 0 deltas
software/host/linux/usr/tests/qp_rping_mw.c: 0 deltas
software/adapter/cepheus/fw/ccos/cc_mq.c: 0 deltas
software/adapter/cepheus/fw/ccos/cc_mq.h: 0 deltas
software/adapter/cepheus/fw/ccos/cc_panic.c: 0 deltas
software/adapter/cepheus/fw/clustercore/cc_console.c: 0 deltas
software/adapter/cepheus/fw/clustercore/cc_netppc.c: 0 deltas
software/adapter/cepheus/fw/clustercore/cc_user.c: 0 deltas
software/adapter/cepheus/fw/kern/uipc_socket2.c: 0 deltas
software/adapter/cepheus/fw/net/if_gmac.c: 0 deltas
software/adapter/cepheus/fw/netinet/rdma.c: 0 deltas
software/adapter/cepheus/fw/netinet/rdma_downcalls.c: 0 deltas
software/adapter/cepheus/fw/netinet/tcp_output.c: 0 deltas
software/common/include/clustercore/cc_adapter.h: 0 deltas
software/common/include/clustercore/cc_ivn.h: 0 deltas
software/common/include/clustercore/cc_types.h: 0 deltas
software/fvt/ccil/tet_scen: 0 deltas
software/host/common/include/clustercore/cc_mq.h: 0 deltas
software/host/linux/sys/devccil/devccil_mq.c: 0 deltas
software/host/linux/usr/Makefile: 0 deltas
software/host/linux/usr/cconfig/cconfig.c: 0 deltas
software/host/linux/usr/ccons/ccons.c: 0 deltas
software/host/linux/usr/libccil/ccil_mq.c: 0 deltas
software/host/linux/usr/libccil/ccil_qp.c: 0 deltas
software/host/linux/usr/tests/Makefile: 0 deltas
---------------------------------------------------------------------------
takepatch: saved entire patch in PENDING/2004-08-23.05
---------------------------------------------------------------------------
Applying  35 revisions to ChangeSet

=================================== ERROR 
====================================
takepatch: software/SCCS/s.Build is edited and modified; unsafe to 
overwrite.
Applying   1 revisions to software/adapter/cepheus/fw/netinet/rdma_input.c
Applying   1 revisions to software/header_gcc.mk
Applying   1 revisions to software/kitting/ccil_bin.bom
Applying   1 revisions to software/kitting/config_IP
Applying   2 revisions to software/kitting/install_fw
takepatch: software/SCCS/s.mark_build is edited and modified; unsafe to 
overwrite.
Applying   1 revisions to software/adapter/etherboot/src/Makefile.main
Applying   1 revisions to 
software/adapter/etherboot/src/drivers/net/amm_ccore.c
Applying   2 revisions to new file software/host/linux/usr/ccroute/Makefile
Applying   4 revisions to new file 
software/host/linux/usr/ccroute/ccroute.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_barrier.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_bcast.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_checks.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_common.h
Applying   2 revisions to software/host/linux/usr/ccpt/ccpt_display.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_init.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_main.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_pingping.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_pingpong.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_ring.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_streaming.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_wrs.c
Applying   1 revisions to software/host/linux/usr/ccpt/ccpt_wrs.h
Applying   1 revisions to software/host/linux/usr/ccpt/docs/ccil-perf.txt
Applying   1 revisions to software/host/linux/usr/ccpt/tests.sh
Applying   1 revisions to software/host/linux/usr/tests/datatest/dt_run.pl
Applying   3 revisions to new file 
software/host/linux/usr/tests/qp_rping_mw.c
Applying   1 revisions to software/adapter/cepheus/fw/ccos/cc_mq.c
Applying   1 revisions to software/adapter/cepheus/fw/ccos/cc_mq.h
Applying   1 revisions to software/adapter/cepheus/fw/ccos/cc_panic.c
Applying   1 revisions to 
software/adapter/cepheus/fw/clustercore/cc_console.c
Applying   1 revisions to 
software/adapter/cepheus/fw/clustercore/cc_netppc.c
Applying   1 revisions to software/adapter/cepheus/fw/clustercore/cc_user.c
Applying   1 revisions to software/adapter/cepheus/fw/kern/uipc_socket2.c
Applying   1 revisions to software/adapter/cepheus/fw/net/if_gmac.c
Applying   5 revisions to software/adapter/cepheus/fw/netinet/rdma.c
Applying   8 revisions to 
software/adapter/cepheus/fw/netinet/rdma_downcalls.c
Applying   1 revisions to software/adapter/cepheus/fw/netinet/tcp_output.c
Applying   1 revisions to software/common/include/clustercore/cc_adapter.h
Applying   1 revisions to software/common/include/clustercore/cc_ivn.h
Applying   3 revisions to software/common/include/clustercore/cc_types.h
Applying   1 revisions to software/fvt/ccil/tet_scen
Applying   1 revisions to software/host/common/include/clustercore/cc_mq.h
takepatch: software/host/linux/sys/devccil/SCCS/s.devccil_mq.c is edited 
and modified; unsafe to overwrite.
Applying   2 revisions to software/host/linux/usr/Makefile
Applying   1 revisions to software/host/linux/usr/cconfig/cconfig.c
Applying   2 revisions to software/host/linux/usr/ccons/ccons.c
Applying   1 revisions to software/host/linux/usr/libccil/ccil_mq.c
Applying   1 revisions to software/host/linux/usr/libccil/ccil_qp.c
Applying   1 revisions to software/host/linux/usr/tests/Makefile
takepatch: patch left in PENDING/2004-08-23.05
==============================================================================

35090 bytes uncompressed to 173122, 4.93X expansion



-- 
Timur Tabi
Staff Software Engineer
[email protected]
_______________________________________________
Bitkeeper-users mailing list
[email protected]
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.