Right-click on the white background of your Explorer window. Click BK Checkin Tool...

This will launch the BitKeeper checkin tool that we will use to walk through, comment our file changes and then commit our changeset to the repository.

So, we can see in our file list that citool has found the changes we made to recovery.c as well as the extra foo.c file we created. Citool has already selected the first modified file under BK control (which is recovery.c) and is showing us the changes made to the file in the lower window. Citool doesn't need to show us the entire contents of the file or its changes, it's showing us just the differences between our current, working version and the last version committed in the repo.

We can see all of our changes to recovery.c right there, and the diffs look good, so let's give it a comment. For a little extra reading, you can read about our thoughts on commit comments. You can enter any comment you want for the changes, and notice that the icon on the file shifts to a green check to show us that this file is now set to be included in our commit.

Give recovery.c a comment. Select foo.c in the file list.

When we click on foo.c, citool sees that this is a new file and doesn't know anything about it, so it just dumps the file contents to the lower window.

Click the icon next to foo.c.

We see that citool has now marked this file to be included in our commit and has entered a default little comment about the file being new. You can change the comment if you like, or you can just leave the default new message in there.

We have two files ready to be committed, now all we need is a ChangeSet comment.

Click on the ChangeSet file

You should see the files we're ready to commit down in the lower window along with their per-file comments. This gives you an idea of what is about to be committed with this changeset. Remember, this comment is more a summary of the overall change, so just a few lines describing what the change is about should do. You can comment it with anything you like for a test drive here. Once you give the changeset a comment, you should see the green check next to the ChangeSet file, and you should now see the Commit button over on the right is ready to go. It should look something like this:

Click the Commit button twice

Now all the magic starts happening. The citool will walk through and check in each of the files and then commit the whole thing as a changeset to our repository. Once the commit has completed with no problems, the citool will automatically close. Now we can see in the Explorer that all of our files are green again. Notice that foo.c and recovery.c are now marked as read-only again. This is, again, because our repo is in checkout: get mode. When a commit is done, each file in the cset is checked in and committed and then checked back out in whatever the default mode is.

So, we've pulled in a change from a different parent, and now we've gone and done a little work and made our own change.