BitKeeper - "stripdel: removed 2 deltas from control"

When cloning a repository I received this message :

Looking for, and removing, any uncommitted deltas...
stripdel: removed 2 deltas from myFile.php

I believe BK is saying :

In the repo you're cloning, there is one file with two deltas that are checked in' but not committed. To give you a consistent, committed view of the repo, I'm going to strip out these 'staged' changes and give you only the committed versions.

I 'bk status' in the repository. That indicated there was one file with staged, but uncommitted edits :


Scmbug for Git/BitKeeper - Bugzilla Integration

I ran across an interesting open source program called Scmbug. Scmbug is a system that integrates software configuration management with bug-tracking.

I was looking for a tool that would help with :

* Showing what bugs are fixed in a particular build or revision control commit?

* Automatically updating a bug tracker when bugs are completed (fixed) and approved.

* Not allowing unapproved bugs to be committed to a given branch.


Useful BitKeeper commands

Here are some useful BitKeeper commands :


- bk helptool &

Repository Management

- bk clone -l /home/usr/dluhman/repos/code /tmp/devdkl-test/code

- bk parent

- bk pull -ln

- bk citool

- bk push -ln

File Management

- bk new somefile.php

- bk edit someExistingFile.php

- bk -Ur. edit -S

- bk mv oldFileName.php newFileName.php

Examining Changes & Reporting

- bk revtool

- bk csettool -r1.6887.1.60 &

- bk log -r1.6887.1.61

- bk changes -uUSERNAME


How to apply (export/import) a patch in BitKeeper

Let's say you need to backport a fix from one BitKeeper repository to another. Here's one way to do it. I suppose there are other or better ways to apply a patch, especially if you have a lot of changesets to backport. But if you're limited to a few changesetd, this seems to work for me.

The following documentation is useful :

1. Create personal clone of target repository :

$ pwd
$ mkdir target
$ cd target
$ bk clone /share/source/code code

"Local branches" and BitKeeper

As far as I know, BitKeeper does not seem to support the notion of "local" (intra-repository) branches.

Git supports these, and I've found them very useful. With Git, you can easily have debug/test branches without the overhead or config issues of an entirely different repo. I've even used one branch per bug so I can have several things in the air before merging them into the master branch.

The only way I can see to do this in BitKeeper is to have separate repos, which wastes disk space and adds the trouble of creating and managing separate directory trees in the file system.


Handling BitKeeper merge conflicts

I'm more familiar with Git and its merge process, but I also use BitKeeper and sometimes run into merge conflicts. Here's some info on how to handle them.

Unlike Git, BitKeeper doesn't have the notion of "local" branches, so all merges are from push/pull operations. BitKeeper has a merge command, but it's for merging single files, rather than merging one local branch into another.

Subscribe to RSS - BitKeeper